summaryrefslogtreecommitdiffstatshomepage
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 ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ 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(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(1*8, 45*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(turbofrc)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(karatblz)
- MDRV_VIDEO_UPDATE(karatblz)
+ 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(1*8, 45*8-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(turbofrc)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_VIDEO_START(karatblz)
+ MCFG_VIDEO_UPDATE(karatblz)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz ) /* verified on pcb */
- 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, XTAL_8MHz ) /* verified on pcb */
+ 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( spinlbrk, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(spinlbrk_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* there are vectors for 3 and 4 too */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(spinlbrk_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* there are vectors for 3 and 4 too */
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5mhz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5mhz 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(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(1*8, 45*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(turbofrc)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(spinlbrk)
- MDRV_VIDEO_UPDATE(spinlbrk)
+ 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(1*8, 45*8-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(turbofrc)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_VIDEO_START(spinlbrk)
+ MCFG_VIDEO_UPDATE(spinlbrk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
- 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, XTAL_8MHz) /* verified on pcb */
+ 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( turbofrc, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(turbofrc_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(turbofrc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_5MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_5MHz) /* 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, 44*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(turbofrc)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(turbofrc)
+ 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, 44*8-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(turbofrc)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(turbofrc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
- 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, XTAL_8MHz) /* verified on pcb */
+ 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( aerofgtb, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerofgtb_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(aerofgtb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(aerofgt_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(aerofgt_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(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
/* wrong but improves sprite-background synchronization */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
- MDRV_GFXDECODE(aerofgtb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
+ MCFG_GFXDECODE(aerofgtb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(turbofrc)
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(turbofrc)
/* 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( aerofgt, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(aerofgt_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(aerofgt_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5 MHz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(aerofgt_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5 MHz verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(aerofgt_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(400))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(400))
/* wrong but improves sprite-background synchronization */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(aerofgt)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_GFXDECODE(aerofgt)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(aerofgt)
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(aerofgt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
- 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, XTAL_8MHz) /* verified on pcb */
+ 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( aerfboot, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerfboot_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(aerfboot_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(aerfboot_sound_map)
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(aerfboot_sound_map)
- 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(500))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
/* wrong but improves sprite-background synchronization */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
- MDRV_GFXDECODE(aerfboot)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
+ MCFG_GFXDECODE(aerfboot)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(aerfboot)
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(aerfboot)
/* 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( aerfboo2, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerfboo2_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(aerfboo2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- 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(500))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
/* wrong but improves sprite-background synchronization */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
- MDRV_GFXDECODE(aerfboo2)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
+ MCFG_GFXDECODE(aerfboo2)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(aerfboo2)
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(aerfboo2)
/* 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( wbbc97, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(wbbc97_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(wbbc97_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(wbbc97_sound_map)
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(wbbc97_sound_map)
/* IRQs are triggered by the YM3812 */
- 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_RGB32)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+14, 44*8-1+4, 0*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_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+14, 44*8-1+4, 0*8, 30*8-1)
- MDRV_GFXDECODE(wbbc97)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(wbbc97)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(wbbc97)
- MDRV_VIDEO_UPDATE(wbbc97)
+ MCFG_VIDEO_START(wbbc97)
+ MCFG_VIDEO_UPDATE(wbbc97)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, 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/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index ca5682b81b0..3b0f4428c75 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -633,59 +633,59 @@ static const kaneko_pandora_interface airbustr_pandora_config =
static MACHINE_CONFIG_START( airbustr, airbustr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("master", Z80, 6000000) // ???
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_IO_MAP(master_io_map)
- MDRV_CPU_VBLANK_INT_HACK(master_interrupt, 2) // nmi caused by sub cpu?, ?
-
- MDRV_CPU_ADD("slave", Z80, 6000000) // ???
- MDRV_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_IO_MAP(slave_io_map)
- MDRV_CPU_VBLANK_INT_HACK(slave_interrupt, 2) // nmi caused by main cpu, ?
-
- MDRV_CPU_ADD("audiocpu", Z80, 6000000) // ???
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // nmi are caused by sub cpu writing a sound command
-
- MDRV_QUANTUM_TIME(HZ(6000)) // Palette RAM is filled by sub cpu with data supplied by main cpu
+ MCFG_CPU_ADD("master", Z80, 6000000) // ???
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_IO_MAP(master_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(master_interrupt, 2) // nmi caused by sub cpu?, ?
+
+ MCFG_CPU_ADD("slave", Z80, 6000000) // ???
+ MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_IO_MAP(slave_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(slave_interrupt, 2) // nmi caused by main cpu, ?
+
+ MCFG_CPU_ADD("audiocpu", Z80, 6000000) // ???
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) // nmi are caused by sub cpu writing a sound command
+
+ MCFG_QUANTUM_TIME(HZ(6000)) // Palette RAM is filled by sub cpu with data supplied by main cpu
// Maybe a high value is safer in order to avoid glitches
- MDRV_MACHINE_START(airbustr)
- MDRV_MACHINE_RESET(airbustr)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_MACHINE_START(airbustr)
+ MCFG_MACHINE_RESET(airbustr)
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
/* 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, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(airbustr)
- MDRV_PALETTE_LENGTH(768)
+ 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, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(airbustr)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_KANEKO_PANDORA_ADD("pandora", airbustr_pandora_config)
+ MCFG_KANEKO_PANDORA_ADD("pandora", airbustr_pandora_config)
- MDRV_VIDEO_START(airbustr)
- MDRV_VIDEO_UPDATE(airbustr)
- MDRV_VIDEO_EOF(airbustr)
+ MCFG_VIDEO_START(airbustr)
+ MCFG_VIDEO_UPDATE(airbustr)
+ MCFG_VIDEO_EOF(airbustr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", 12000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 12000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( airbustrb, airbustr )
- MDRV_WATCHDOG_TIME_INIT(SEC(0)) // no protection device or watchdog
+ MCFG_WATCHDOG_TIME_INIT(SEC(0)) // no protection device or watchdog
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 3e30f9a3273..3168aaf3d1c 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -208,57 +208,57 @@ static const k051316_interface ajax_k051316_intf =
static MACHINE_CONFIG_START( ajax, ajax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 12/4 MHz*/
- MDRV_CPU_PROGRAM_MAP(ajax_main_map)
- MDRV_CPU_VBLANK_INT("screen", ajax_interrupt) /* IRQs triggered by the 051960 */
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* 12/4 MHz*/
+ MCFG_CPU_PROGRAM_MAP(ajax_main_map)
+ MCFG_CPU_VBLANK_INT("screen", ajax_interrupt) /* IRQs triggered by the 051960 */
- MDRV_CPU_ADD("sub", M6809, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(ajax_sub_map)
+ MCFG_CPU_ADD("sub", M6809, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(ajax_sub_map)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.58 MHz */
- MDRV_CPU_PROGRAM_MAP(ajax_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.58 MHz */
+ MCFG_CPU_PROGRAM_MAP(ajax_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(ajax)
- MDRV_MACHINE_START(ajax)
+ MCFG_MACHINE_RESET(ajax)
+ MCFG_MACHINE_START(ajax)
/* 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(14*8, (64-14)*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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(ajax)
- MDRV_VIDEO_UPDATE(ajax)
+ MCFG_VIDEO_START(ajax)
+ MCFG_VIDEO_UPDATE(ajax)
- MDRV_K052109_ADD("k052109", ajax_k052109_intf)
- MDRV_K051960_ADD("k051960", ajax_k051960_intf)
- MDRV_K051316_ADD("k051316", ajax_k051316_intf)
+ MCFG_K052109_ADD("k052109", ajax_k052109_intf)
+ MCFG_K051960_ADD("k051960", ajax_k051960_intf)
+ MCFG_K051316_ADD("k051316", ajax_k051316_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("k007232_1", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_interface_1)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
-
- MDRV_SOUND_ADD("k007232_2", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_interface_2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_interface_1)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
+
+ MCFG_SOUND_ADD("k007232_2", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_interface_2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index f69f0720bfa..ca58252f769 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -259,31 +259,31 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( hanaroku, albazc_state )
- MDRV_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(hanaroku_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(hanaroku_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(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 48*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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(hanaroku)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(hanaroku)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(hanaroku)
- MDRV_VIDEO_START(hanaroku)
- MDRV_VIDEO_UPDATE(hanaroku)
+ MCFG_PALETTE_INIT(hanaroku)
+ MCFG_VIDEO_START(hanaroku)
+ MCFG_VIDEO_UPDATE(hanaroku)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000) /* ? MHz */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000) /* ? MHz */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index 72d2f3de428..a6078434aff 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -396,42 +396,42 @@ static MACHINE_RESET( yumefuda )
static MACHINE_CONFIG_START( yumefuda, albazg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(yumefuda)
- MDRV_MACHINE_RESET(yumefuda)
+ MCFG_MACHINE_START(yumefuda)
+ MCFG_MACHINE_RESET(yumefuda)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_WATCHDOG_VBLANK_INIT(8) // timing is unknown
+ MCFG_WATCHDOG_VBLANK_INIT(8) // timing is unknown
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 32*8-1)
- MDRV_MC6845_ADD("crtc", H46505, MASTER_CLOCK/16, mc6845_intf) /* hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, MASTER_CLOCK/16, mc6845_intf) /* hand tuned to get ~60 fps */
- MDRV_GFXDECODE( yumefuda )
- MDRV_PALETTE_LENGTH(0x80)
+ MCFG_GFXDECODE( yumefuda )
+ MCFG_PALETTE_LENGTH(0x80)
- MDRV_VIDEO_START( yumefuda )
- MDRV_VIDEO_UPDATE( yumefuda )
+ MCFG_VIDEO_START( yumefuda )
+ MCFG_VIDEO_UPDATE( yumefuda )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/***************************************************************************************/
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index 6ac4e3ceb69..f663dae5443 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -570,35 +570,35 @@ static INTERRUPT_GEN( n64_vblank )
static MACHINE_CONFIG_START( aleck64, _n64_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", VR4300BE, 93750000)
- MDRV_CPU_CONFIG(vr4300_config)
- MDRV_CPU_PROGRAM_MAP(n64_map)
- MDRV_CPU_VBLANK_INT("screen", n64_vblank)
-
- MDRV_CPU_ADD("rsp", RSP, 62500000)
- MDRV_CPU_CONFIG(n64_rsp_config)
- MDRV_CPU_PROGRAM_MAP(rsp_map)
-
- MDRV_MACHINE_START( n64 )
- MDRV_MACHINE_RESET( n64 )
-
- 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(640, 525)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 239)
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(n64)
- MDRV_VIDEO_UPDATE(n64)
-
- MDRV_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_CPU_ADD("maincpu", VR4300BE, 93750000)
+ MCFG_CPU_CONFIG(vr4300_config)
+ MCFG_CPU_PROGRAM_MAP(n64_map)
+ MCFG_CPU_VBLANK_INT("screen", n64_vblank)
+
+ MCFG_CPU_ADD("rsp", RSP, 62500000)
+ MCFG_CPU_CONFIG(n64_rsp_config)
+ MCFG_CPU_PROGRAM_MAP(rsp_map)
+
+ MCFG_MACHINE_START( n64 )
+ MCFG_MACHINE_RESET( n64 )
+
+ 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(640, 525)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239)
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(n64)
+ MCFG_VIDEO_UPDATE(n64)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ 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
static DRIVER_INIT( aleck64 )
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index f6ddd2c3dff..400749b9a81 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -429,64 +429,64 @@ static const mos6526_interface cia_1_intf =
static MACHINE_CONFIG_START( alg_r1, alg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map_r1)
+ MCFG_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map_r1)
- MDRV_MACHINE_START(alg)
- MDRV_MACHINE_RESET(alg)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(alg)
+ MCFG_MACHINE_RESET(alg)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_LASERDISC_ADD("laserdisc", SONY_LDP1450, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(amiga, 512*2, 262, BITMAP_FORMAT_INDEXED16)
- MDRV_LASERDISC_OVERLAY_CLIP((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
+ MCFG_LASERDISC_ADD("laserdisc", SONY_LDP1450, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(amiga, 512*2, 262, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_OVERLAY_CLIP((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(59.997)
- MDRV_SCREEN_SIZE(512*2, 262)
- MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(59.997)
+ MCFG_SCREEN_SIZE(512*2, 262)
+ MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
- MDRV_PALETTE_LENGTH(4097)
- MDRV_PALETTE_INIT(amiga)
+ MCFG_PALETTE_LENGTH(4097)
+ MCFG_PALETTE_INIT(amiga)
- MDRV_VIDEO_START(alg)
+ MCFG_VIDEO_START(alg)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("amiga", AMIGA, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.25)
+ MCFG_SOUND_ADD("amiga", AMIGA, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.25)
- 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)
/* cia */
- MDRV_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
- MDRV_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
+ MCFG_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
+ MCFG_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( alg_r2, alg_r1 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(main_map_r2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(main_map_r2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( picmatic, alg_r1 )
/* adjust for PAL specs */
- MDRV_CPU_REPLACE("maincpu", M68000, AMIGA_68000_PAL_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map_picmatic)
+ MCFG_CPU_REPLACE("maincpu", M68000, AMIGA_68000_PAL_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map_picmatic)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_SIZE(512*2, 312)
- MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 300+8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_SIZE(512*2, 312)
+ MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 300+8-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index a35407380e7..34b957ee885 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -267,46 +267,46 @@ static MACHINE_CONFIG_START( aliens, aliens_state )
/* external clock should be 12MHz probably, CPU internal divider and precise cycle timings */
/* are unknown though. 3MHz is too low, sprites flicker in the pseudo-3D levels */
- MDRV_CPU_ADD("maincpu", KONAMI, 6000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(aliens_map)
- MDRV_CPU_VBLANK_INT("screen", aliens_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, 6000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(aliens_map)
+ MCFG_CPU_VBLANK_INT("screen", aliens_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(aliens_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(aliens_sound_map)
- MDRV_MACHINE_START(aliens)
- MDRV_MACHINE_RESET(aliens)
+ MCFG_MACHINE_START(aliens)
+ MCFG_MACHINE_RESET(aliens)
/* 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(14*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(aliens)
- MDRV_VIDEO_UPDATE(aliens)
+ MCFG_VIDEO_START(aliens)
+ MCFG_VIDEO_UPDATE(aliens)
- MDRV_K052109_ADD("k052109", aliens_k052109_intf)
- MDRV_K051960_ADD("k051960", aliens_k051960_intf)
+ MCFG_K052109_ADD("k052109", aliens_k052109_intf)
+ MCFG_K051960_ADD("k051960", aliens_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index d6f14256b57..b672747022b 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1948,381 +1948,381 @@ static MACHINE_START( alpha68k_II )
static MACHINE_CONFIG_START( sstingry, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MDRV_CPU_PROGRAM_MAP(kyros_map)
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
+ MCFG_CPU_PROGRAM_MAP(kyros_map)
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sstingry_sound_map)
- MDRV_CPU_IO_MAP(kyros_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(sstingry_sound_map)
+ MCFG_CPU_IO_MAP(kyros_sound_portmap)
//AT
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
//ZT
- 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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(sstingry)
- MDRV_PALETTE_LENGTH(256 + 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, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(sstingry)
+ MCFG_PALETTE_LENGTH(256 + 1)
//AT
- MDRV_PALETTE_INIT(kyros)
+ MCFG_PALETTE_INIT(kyros)
//ZT
- MDRV_VIDEO_UPDATE(sstingry)
+ MCFG_VIDEO_UPDATE(sstingry)
/* sound hardware */
//AT
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM2203, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ym2", YM2203, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ym3", YM2203, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ym3", YM2203, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
//ZT
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kyros, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* Verified on bootleg PCB */
- MDRV_CPU_PROGRAM_MAP(kyros_map)
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* Verified on bootleg PCB */
+ MCFG_CPU_PROGRAM_MAP(kyros_map)
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* Verified on bootleg PCB */
- MDRV_CPU_PROGRAM_MAP(kyros_sound_map)
- MDRV_CPU_IO_MAP(kyros_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* Verified on bootleg PCB */
+ MCFG_CPU_PROGRAM_MAP(kyros_sound_map)
+ MCFG_CPU_IO_MAP(kyros_sound_portmap)
//AT
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
//ZT
- 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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(kyros)
- MDRV_PALETTE_LENGTH(256 + 1)
-
- MDRV_PALETTE_INIT(kyros)
- MDRV_VIDEO_UPDATE(kyros)
+ 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(kyros)
+ MCFG_PALETTE_LENGTH(256 + 1)
+
+ MCFG_PALETTE_INIT(kyros)
+ MCFG_VIDEO_UPDATE(kyros)
/* sound hardware */
//AT
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ym3", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ym3", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
//ZT
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jongbou, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(kyros_map)
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,17) // must be at least 4 for the controls to be smooth
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(kyros_map)
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt,17) // must be at least 4 for the controls to be smooth
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(jongbou_sound_map)
- MDRV_CPU_IO_MAP(jongbou_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) // guess, controls sound speed
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(jongbou_sound_map)
+ MCFG_CPU_IO_MAP(jongbou_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) // guess, controls sound speed
- 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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(jongbou)
- MDRV_PALETTE_LENGTH(256 + 1)
-
- MDRV_PALETTE_INIT(kyros)
- MDRV_VIDEO_UPDATE(kyros)
+ 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(jongbou)
+ MCFG_PALETTE_LENGTH(256 + 1)
+
+ MCFG_PALETTE_INIT(kyros)
+ MCFG_VIDEO_UPDATE(kyros)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( alpha68k_I, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_I_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
+ MCFG_CPU_PROGRAM_MAP(alpha68k_I_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone
- MDRV_CPU_PROGRAM_MAP(alpha68k_I_s_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone
+ MCFG_CPU_PROGRAM_MAP(alpha68k_I_s_map)
- 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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(paddle)
+ 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(paddle)
//AT
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(paddlem)
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT(paddlem)
//ZT
- MDRV_VIDEO_UPDATE(alpha68k_I)
+ MCFG_VIDEO_UPDATE(alpha68k_I)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( alpha68k_II, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* Correct */
- MDRV_CPU_PROGRAM_MAP(alpha68k_II_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* Correct */
+ MCFG_CPU_PROGRAM_MAP(alpha68k_II_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 7500) //AT
+ MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 7500) //AT
- MDRV_MACHINE_START(alpha68k_II)
- MDRV_MACHINE_RESET(alpha68k_II)
+ MCFG_MACHINE_START(alpha68k_II)
+ MCFG_MACHINE_RESET(alpha68k_II)
/* 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(alpha68k_II)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(alpha68k)
- MDRV_VIDEO_UPDATE(alpha68k_II)
+ 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(alpha68k_II)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(alpha68k)
+ MCFG_VIDEO_UPDATE(alpha68k_II)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD("ym2", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( btlfieldb, alpha68k_II )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
MACHINE_CONFIG_END
//AT
static MACHINE_CONFIG_START( alpha68k_II_gm, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(alpha68k_II_map)
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt, 4)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(alpha68k_II_map)
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt, 4)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000*2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 7500)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000*2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 7500)
- MDRV_MACHINE_START(alpha68k_II)
- MDRV_MACHINE_RESET(alpha68k_II)
+ MCFG_MACHINE_START(alpha68k_II)
+ MCFG_MACHINE_RESET(alpha68k_II)
/* 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(alpha68k_II)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(alpha68k)
- MDRV_VIDEO_UPDATE(alpha68k_II)
+ 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(alpha68k_II)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(alpha68k)
+ MCFG_VIDEO_UPDATE(alpha68k_II)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD("ym2", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
//ZT
static MACHINE_CONFIG_START( alpha68k_V, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_V_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(alpha68k_V_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
+ MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
- MDRV_MACHINE_START(alpha68k_V)
- MDRV_MACHINE_RESET(alpha68k_V)
+ MCFG_MACHINE_START(alpha68k_V)
+ MCFG_MACHINE_RESET(alpha68k_V)
/* 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(alpha68k_V)
- MDRV_PALETTE_LENGTH(4096)
-
- MDRV_VIDEO_START(alpha68k)
- MDRV_VIDEO_UPDATE(alpha68k_V)
+ 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(alpha68k_V)
+ MCFG_PALETTE_LENGTH(4096)
+
+ MCFG_VIDEO_START(alpha68k)
+ MCFG_VIDEO_UPDATE(alpha68k_V)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD("ym2", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( alpha68k_V_sb, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_V_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(alpha68k_V_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
+ MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
- MDRV_MACHINE_START(alpha68k_V)
- MDRV_MACHINE_RESET(alpha68k_V)
+ MCFG_MACHINE_START(alpha68k_V)
+ MCFG_MACHINE_RESET(alpha68k_V)
/* 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(alpha68k_V)
- MDRV_PALETTE_LENGTH(4096)
-
- MDRV_VIDEO_START(alpha68k)
- MDRV_VIDEO_UPDATE(alpha68k_V_sb)
+ 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(alpha68k_V)
+ MCFG_PALETTE_LENGTH(4096)
+
+ MCFG_VIDEO_START(alpha68k)
+ MCFG_VIDEO_UPDATE(alpha68k_V_sb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD("ym2", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tnextspc, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
- MDRV_CPU_PROGRAM_MAP(tnextspc_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
+ MCFG_CPU_PROGRAM_MAP(tnextspc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(tnextspc_sound_map)
- MDRV_CPU_IO_MAP(tnextspc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(tnextspc_sound_map)
+ MCFG_CPU_IO_MAP(tnextspc_sound_portmap)
- 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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(tnextspc)
-
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(paddlem)
- MDRV_VIDEO_UPDATE(alpha68k_I)
+ 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(tnextspc)
+
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT(paddlem)
+ MCFG_VIDEO_UPDATE(alpha68k_I)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index f0a3877c1b1..9076ddea4ce 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -612,44 +612,44 @@ GFXDECODE_END
static MACHINE_CONFIG_START( amaticmg, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */
- MDRV_CPU_PROGRAM_MAP(amaticmg_map)
- MDRV_CPU_IO_MAP(amaticmg_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */
+ MCFG_CPU_PROGRAM_MAP(amaticmg_map)
+ MCFG_CPU_IO_MAP(amaticmg_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
/* 3x 8255 */
-// MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
-// MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
-// MDRV_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
+// MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+// MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+// MCFG_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
/* 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-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-1)
-// MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
+// MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
- MDRV_GFXDECODE(amaticmg)
+ MCFG_GFXDECODE(amaticmg)
- MDRV_PALETTE_INIT(amaticmg)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(amaticmg)
- MDRV_VIDEO_UPDATE(amaticmg)
+ MCFG_PALETTE_INIT(amaticmg)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_VIDEO_START(amaticmg)
+ MCFG_VIDEO_UPDATE(amaticmg)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
+// MCFG_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("ymsnd", YM3812, SND_CLOCK)
-// MDRV_SOUND_CONFIG(ym3812_config)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MCFG_SOUND_ADD("ymsnd", YM3812, SND_CLOCK)
+// MCFG_SOUND_CONFIG(ym3812_config)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-// MDRV_SOUND_ADD("dac", DAC, 0) /* Y3014B */
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MCFG_SOUND_ADD("dac", DAC, 0) /* Y3014B */
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index d08b639fb31..0f4dd94576b 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -229,34 +229,34 @@ static const ay8910_interface ay8910_interface_2 =
static MACHINE_CONFIG_START( ambush, ambush_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ 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(2500) /* not accurate */)
- 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-3) /* The -3 makes the cocktail mode perfect */
- MDRV_GFXDECODE(ambush)
- MDRV_PALETTE_LENGTH(256)
-
- MDRV_PALETTE_INIT(ambush)
- MDRV_VIDEO_UPDATE(ambush)
+ 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(0*8, 32*8-1, 2*8, 30*8-3) /* The -3 makes the cocktail mode perfect */
+ MCFG_GFXDECODE(ambush)
+ MCFG_PALETTE_LENGTH(256)
+
+ MCFG_PALETTE_INIT(ambush)
+ MCFG_VIDEO_UPDATE(ambush)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index 72c0ff5b2d3..a65f5b97519 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -1166,36 +1166,36 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( ampoker2, ampoker2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(ampoker2_map)
- MDRV_CPU_IO_MAP(ampoker2_io_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1536)
- MDRV_WATCHDOG_TIME_INIT(MSEC(200)) /* 200 ms, measured */
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(ampoker2_map)
+ MCFG_CPU_IO_MAP(ampoker2_io_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 1536)
+ MCFG_WATCHDOG_TIME_INIT(MSEC(200)) /* 200 ms, measured */
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
/* if VBLANK is used, the watchdog timer stop to work.
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
*/
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(20*8, 56*8-1, 2*8, 32*8-1)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(20*8, 56*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(ampoker2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(ampoker2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(ampoker2)
- MDRV_VIDEO_START(ampoker2)
- MDRV_VIDEO_UPDATE(ampoker2)
+ MCFG_PALETTE_INIT(ampoker2)
+ MCFG_VIDEO_START(ampoker2)
+ MCFG_VIDEO_UPDATE(ampoker2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sigma2k, ampoker2 )
@@ -1203,8 +1203,8 @@ static MACHINE_CONFIG_DERIVED( sigma2k, ampoker2 )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(sigma2k)
- MDRV_VIDEO_START(sigma2k)
+ MCFG_GFXDECODE(sigma2k)
+ MCFG_VIDEO_START(sigma2k)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 0705d9700d9..70190238cbd 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -274,37 +274,37 @@ static MACHINE_RESET( amspdwy )
static MACHINE_CONFIG_START( amspdwy, amspdwy_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,3000000)
- MDRV_CPU_PROGRAM_MAP(amspdwy_map)
- MDRV_CPU_IO_MAP(amspdwy_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ: 60Hz, NMI: retn */
+ MCFG_CPU_ADD("maincpu", Z80,3000000)
+ MCFG_CPU_PROGRAM_MAP(amspdwy_map)
+ MCFG_CPU_IO_MAP(amspdwy_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ: 60Hz, NMI: retn */
- MDRV_CPU_ADD("audiocpu", Z80,3000000) /* Can't be disabled: the YM2151 timers must work */
- MDRV_CPU_PROGRAM_MAP(amspdwy_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,3000000) /* Can't be disabled: the YM2151 timers must work */
+ MCFG_CPU_PROGRAM_MAP(amspdwy_sound_map)
- MDRV_MACHINE_START(amspdwy)
- MDRV_MACHINE_RESET(amspdwy)
+ MCFG_MACHINE_START(amspdwy)
+ MCFG_MACHINE_RESET(amspdwy)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(amspdwy)
- MDRV_PALETTE_LENGTH(32)
-
- MDRV_VIDEO_START(amspdwy)
- MDRV_VIDEO_UPDATE(amspdwy)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ MCFG_GFXDECODE(amspdwy)
+ MCFG_PALETTE_LENGTH(32)
+
+ MCFG_VIDEO_START(amspdwy)
+ MCFG_VIDEO_UPDATE(amspdwy)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3000000)
- MDRV_SOUND_CONFIG(amspdwy_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3000000)
+ MCFG_SOUND_CONFIG(amspdwy_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index b5445ceaf29..01f4e27775e 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -606,47 +606,47 @@ static MACHINE_RESET( angelkds )
static MACHINE_CONFIG_START( angelkds, angelkds_state )
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* 8MHz? 6 seems too slow? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* 8MHz? 6 seems too slow? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, 4000000) /* 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_IO_MAP(sub_portmap)
+ MCFG_CPU_ADD("sub", Z80, 4000000) /* 8 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_IO_MAP(sub_portmap)
- MDRV_MACHINE_START(angelkds)
- MDRV_MACHINE_RESET(angelkds)
+ MCFG_MACHINE_START(angelkds)
+ MCFG_MACHINE_RESET(angelkds)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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, 1*8, 31*8-1)
- MDRV_GFXDECODE(angelkds)
- MDRV_PALETTE_LENGTH(0x100)
-
- MDRV_VIDEO_START(angelkds)
- MDRV_VIDEO_UPDATE(angelkds)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.65)
- MDRV_SOUND_ROUTE(1, "mono", 0.65)
- MDRV_SOUND_ROUTE(2, "mono", 0.65)
- MDRV_SOUND_ROUTE(3, "mono", 0.45)
-
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.65)
- MDRV_SOUND_ROUTE(1, "mono", 0.65)
- MDRV_SOUND_ROUTE(2, "mono", 0.65)
- MDRV_SOUND_ROUTE(3, "mono", 0.45)
+ 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, 1*8, 31*8-1)
+ MCFG_GFXDECODE(angelkds)
+ MCFG_PALETTE_LENGTH(0x100)
+
+ MCFG_VIDEO_START(angelkds)
+ MCFG_VIDEO_UPDATE(angelkds)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.65)
+ MCFG_SOUND_ROUTE(1, "mono", 0.65)
+ MCFG_SOUND_ROUTE(2, "mono", 0.65)
+ MCFG_SOUND_ROUTE(3, "mono", 0.45)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.65)
+ MCFG_SOUND_ROUTE(1, "mono", 0.65)
+ MCFG_SOUND_ROUTE(2, "mono", 0.65)
+ MCFG_SOUND_ROUTE(3, "mono", 0.45)
MACHINE_CONFIG_END
/*** Rom Loading
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index ffb21932df8..2c89d87ccc9 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -424,65 +424,65 @@ static MACHINE_RESET( appoooh )
static MACHINE_CONFIG_START( appoooh_common, appoooh_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(appoooh)
- MDRV_MACHINE_RESET(appoooh)
+ MCFG_MACHINE_START(appoooh)
+ MCFG_MACHINE_RESET(appoooh)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn1", SN76489, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("sn2", SN76489, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn2", SN76489, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("sn3", SN76489, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn3", SN76489, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( appoooh, appoooh_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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(appoooh)
- MDRV_PALETTE_LENGTH(32*8+32*8)
-
- MDRV_PALETTE_INIT(appoooh)
- MDRV_VIDEO_START(appoooh)
- MDRV_VIDEO_UPDATE(appoooh)
+ 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(appoooh)
+ MCFG_PALETTE_LENGTH(32*8+32*8)
+
+ MCFG_PALETTE_INIT(appoooh)
+ MCFG_VIDEO_START(appoooh)
+ MCFG_VIDEO_UPDATE(appoooh)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( robowres, appoooh_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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(robowres)
- MDRV_PALETTE_LENGTH(32*8+32*8)
-
- MDRV_PALETTE_INIT(robowres)
- MDRV_VIDEO_START(appoooh)
- MDRV_VIDEO_UPDATE(robowres)
+ 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(robowres)
+ MCFG_PALETTE_LENGTH(32*8+32*8)
+
+ MCFG_PALETTE_INIT(robowres)
+ MCFG_VIDEO_START(appoooh)
+ MCFG_VIDEO_UPDATE(robowres)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index d901277a37e..470af9640c4 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -362,41 +362,41 @@ static MACHINE_RESET( aquarium )
static MACHINE_CONFIG_START( aquarium, aquarium_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(snd_map)
- MDRV_CPU_IO_MAP(snd_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(snd_map)
+ MCFG_CPU_IO_MAP(snd_portmap)
- MDRV_MACHINE_START(aquarium)
- MDRV_MACHINE_RESET(aquarium)
+ MCFG_MACHINE_START(aquarium)
+ MCFG_MACHINE_RESET(aquarium)
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 42*8-1, 2*8, 34*8-1)
- MDRV_GFXDECODE(aquarium)
- MDRV_PALETTE_LENGTH(0x1000/2)
-
- MDRV_VIDEO_START(aquarium)
- MDRV_VIDEO_UPDATE(aquarium)
+ 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(2*8, 42*8-1, 2*8, 34*8-1)
+ MCFG_GFXDECODE(aquarium)
+ MCFG_PALETTE_LENGTH(0x1000/2)
+
+ MCFG_VIDEO_START(aquarium)
+ MCFG_VIDEO_UPDATE(aquarium)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
ROM_START( aquarium )
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 4fdca1fdaa0..fdf407613b5 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -365,36 +365,36 @@ static MACHINE_RESET( arabian )
static MACHINE_CONFIG_START( arabian, arabian_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_OSC/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mcu", MB8841, MAIN_OSC/3/2)
- MDRV_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_ADD("mcu", MB8841, MAIN_OSC/3/2)
+ MCFG_CPU_IO_MAP(mcu_io_map)
- MDRV_MACHINE_START(arabian)
- MDRV_MACHINE_RESET(arabian)
+ MCFG_MACHINE_START(arabian)
+ MCFG_MACHINE_RESET(arabian)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 11, 244)
- MDRV_PALETTE_LENGTH(256*32)
-
- MDRV_PALETTE_INIT(arabian)
- MDRV_VIDEO_START(arabian)
- MDRV_VIDEO_UPDATE(arabian)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 11, 244)
+ MCFG_PALETTE_LENGTH(256*32)
+
+ MCFG_PALETTE_INIT(arabian)
+ MCFG_VIDEO_START(arabian)
+ MCFG_VIDEO_UPDATE(arabian)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MAIN_OSC/4/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, MAIN_OSC/4/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index d8eab94a1d8..b01ccd819ba 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -326,33 +326,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( arcadecl, rampart_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(arcadecl)
- MDRV_MACHINE_RESET(arcadecl)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(arcadecl)
+ MCFG_MACHINE_RESET(arcadecl)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(arcadecl)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(arcadecl)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240)
- MDRV_VIDEO_START(arcadecl)
- MDRV_VIDEO_UPDATE(arcadecl)
+ MCFG_VIDEO_START(arcadecl)
+ MCFG_VIDEO_UPDATE(arcadecl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 92c086f28cd..9acfb7cf1b1 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -299,39 +299,39 @@ static const mos6526_interface cia_1_intf =
static MACHINE_CONFIG_START( arcadia, arcadia_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(amiga_map)
+ MCFG_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(amiga_map)
- MDRV_MACHINE_RESET(amiga)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(amiga)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.997)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512*2, 262)
- MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(amiga)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.997)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512*2, 262)
+ MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_INIT(amiga)
- MDRV_VIDEO_START(amiga)
- MDRV_VIDEO_UPDATE(amiga)
+ MCFG_VIDEO_START(amiga)
+ MCFG_VIDEO_UPDATE(amiga)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("amiga", AMIGA, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("amiga", AMIGA, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
/* cia */
- MDRV_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
- MDRV_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
+ MCFG_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
+ MCFG_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index f795fad1cb0..5e481f82cff 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -532,149 +532,149 @@ GFXDECODE_END
static MACHINE_CONFIG_START( argus, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(argus_map)
- MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(argus_map)
+ MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_a)
+ MCFG_CPU_ADD("audiocpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map_a)
#if 0
- MDRV_CPU_IO_MAP(sound_portmap_1)
+ MCFG_CPU_IO_MAP(sound_portmap_1)
#else
- MDRV_CPU_IO_MAP(sound_portmap_2)
+ MCFG_CPU_IO_MAP(sound_portmap_2)
#endif
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is refered to psychic5 driver */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is refered to psychic5 driver */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(argus)
- MDRV_PALETTE_LENGTH(896)
+ MCFG_GFXDECODE(argus)
+ MCFG_PALETTE_LENGTH(896)
- MDRV_VIDEO_START(argus)
- MDRV_VIDEO_RESET(argus)
- MDRV_VIDEO_UPDATE(argus)
+ MCFG_VIDEO_START(argus)
+ MCFG_VIDEO_RESET(argus)
+ MCFG_VIDEO_UPDATE(argus)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
#if 0
- MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.50)
+ MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
#else
- MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.50)
-
- MDRV_SOUND_ADD("ym2", YM2203, 6000000 / 4)
- 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.50)
+ MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
#endif
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( valtric, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(valtric_map)
- MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
+ MCFG_CPU_PROGRAM_MAP(valtric_map)
+ MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_a)
- MDRV_CPU_IO_MAP(sound_portmap_2)
+ MCFG_CPU_ADD("audiocpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map_a)
+ MCFG_CPU_IO_MAP(sound_portmap_2)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is refered to psychic5 driver */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is refered to psychic5 driver */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(valtric)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(valtric)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(valtric)
- MDRV_VIDEO_RESET(valtric)
- MDRV_VIDEO_UPDATE(valtric)
+ MCFG_VIDEO_START(valtric)
+ MCFG_VIDEO_RESET(valtric)
+ MCFG_VIDEO_UPDATE(valtric)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.50)
-
- MDRV_SOUND_ADD("ym2", YM2203, 6000000 / 4)
- 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.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( butasan, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(butasan_map)
- MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
+ MCFG_CPU_PROGRAM_MAP(butasan_map)
+ MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_b)
- MDRV_CPU_IO_MAP(sound_portmap_2)
+ MCFG_CPU_ADD("audiocpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map_b)
+ MCFG_CPU_IO_MAP(sound_portmap_2)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is taken from psychic5 driver */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is taken from psychic5 driver */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(butasan)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(butasan)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(butasan)
- MDRV_VIDEO_RESET(butasan)
- MDRV_VIDEO_UPDATE(butasan)
+ MCFG_VIDEO_START(butasan)
+ MCFG_VIDEO_RESET(butasan)
+ MCFG_VIDEO_UPDATE(butasan)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ROUTE(2, "mono", 0.30)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
-
- MDRV_SOUND_ADD("ym2", YM2203, 6000000 / 4)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ROUTE(2, "mono", 0.30)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ROUTE(2, "mono", 0.30)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ROUTE(2, "mono", 0.30)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index b996ee363a9..743468d393c 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -1199,48 +1199,48 @@ static MACHINE_RESET( aristmk4 )
static MACHINE_CONFIG_START( aristmk4, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK/8) // 1.5mhz (goldenc needs a bit faster for some reason)
- MDRV_CPU_PROGRAM_MAP(aristmk4_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(aristmk4)
- MDRV_MACHINE_RESET(aristmk4 )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/8) // 1.5mhz (goldenc needs a bit faster for some reason)
+ MCFG_CPU_PROGRAM_MAP(aristmk4_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_MACHINE_START(aristmk4)
+ MCFG_MACHINE_RESET(aristmk4 )
+ 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(320, 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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */
- MDRV_GFXDECODE(aristmk4)
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(aristmk4)
+ MCFG_GFXDECODE(aristmk4)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(aristmk4)
- MDRV_VIDEO_START(aristmk4)
- MDRV_VIDEO_UPDATE(aristmk4)
+ MCFG_VIDEO_START(aristmk4)
+ MCFG_VIDEO_UPDATE(aristmk4)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf1 )
- MDRV_VIA6522_ADD("via6522_0", 0, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */
- MDRV_PIA6821_ADD("pia6821_0", aristmk4_pia1_intf)
- MDRV_MC6845_ADD("crtc", MC6845, MAIN_CLOCK/8, mc6845_intf)
- MDRV_MC146818_ADD("rtc", MC146818_IGNORE_CENTURY)
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf1 )
+ MCFG_VIA6522_ADD("via6522_0", 0, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */
+ MCFG_PIA6821_ADD("pia6821_0", aristmk4_pia1_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, MAIN_CLOCK/8, mc6845_intf)
+ MCFG_MC146818_ADD("rtc", MC146818_IGNORE_CENTURY)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
// the Mark IV has X 2 AY8910 sound chips which are tied to the VIA
- MDRV_SOUND_ADD("ay1", AY8910 , MAIN_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_config1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay1", AY8910 , MAIN_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_config1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ay2", AY8910 , MAIN_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_config2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay2", AY8910 , MAIN_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_config2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(meter_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(meter_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c
index 793e3c40973..dd1479ebb90 100644
--- a/src/mame/drivers/aristmk5.c
+++ b/src/mame/drivers/aristmk5.c
@@ -274,50 +274,50 @@ static const i2cmem_interface i2cmem_interface =
#endif
static MACHINE_CONFIG_START( aristmk5, driver_device )
- MDRV_CPU_ADD("maincpu", ARM, 10000000) // ?
- MDRV_CPU_PROGRAM_MAP(aristmk5_map)
+ MCFG_CPU_ADD("maincpu", ARM, 10000000) // ?
+ MCFG_CPU_PROGRAM_MAP(aristmk5_map)
- MDRV_MACHINE_START( aristmk5 )
- MDRV_MACHINE_RESET( aristmk5 )
+ MCFG_MACHINE_START( aristmk5 )
+ MCFG_MACHINE_RESET( aristmk5 )
-// MDRV_I2CMEM_ADD("i2cmem",i2cmem_interface)
+// MCFG_I2CMEM_ADD("i2cmem",i2cmem_interface)
- 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(1280, 1024) //TODO: proper max size?
- MDRV_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 1024-1)
+ 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(1280, 1024) //TODO: proper max size?
+ MCFG_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 1024-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(archimds_vidc)
- MDRV_VIDEO_UPDATE(archimds_vidc)
+ MCFG_VIDEO_START(archimds_vidc)
+ MCFG_VIDEO_UPDATE(archimds_vidc)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac0", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac0", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac3", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac3", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac4", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac4", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac5", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac5", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac6", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac6", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac7", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac7", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
MACHINE_CONFIG_END
#define ARISTOCRAT_MK5_BIOS \
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index e919c80c069..7c87cc6b1d1 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -960,81 +960,81 @@ static MACHINE_RESET( arkanoid )
static MACHINE_CONFIG_START( arkanoid, arkanoid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(arkanoid_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(arkanoid_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
+ MCFG_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
- MDRV_MACHINE_START(arkanoid)
- MDRV_MACHINE_RESET(arkanoid)
+ MCFG_MACHINE_START(arkanoid)
+ MCFG_MACHINE_RESET(arkanoid)
/* 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(arkanoid)
- MDRV_PALETTE_LENGTH(512)
-
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(arkanoid)
- MDRV_VIDEO_UPDATE(arkanoid)
+ 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(arkanoid)
+ MCFG_PALETTE_LENGTH(512)
+
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(arkanoid)
+ MCFG_VIDEO_UPDATE(arkanoid)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", YM2149, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hexa, arkanoid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Imported from arkanoid - correct? */
- MDRV_CPU_PROGRAM_MAP(hexa_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Imported from arkanoid - correct? */
+ MCFG_CPU_PROGRAM_MAP(hexa_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(arkanoid)
- MDRV_MACHINE_RESET(arkanoid)
+ MCFG_MACHINE_START(arkanoid)
+ MCFG_MACHINE_RESET(arkanoid)
/* 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)
+ 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)
- MDRV_GFXDECODE(hexa)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(hexa)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(arkanoid)
- MDRV_VIDEO_UPDATE(hexa)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(arkanoid)
+ MCFG_VIDEO_UPDATE(hexa)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* Imported from arkanoid - correct? */
- MDRV_SOUND_CONFIG(hexa_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* Imported from arkanoid - correct? */
+ MCFG_SOUND_CONFIG(hexa_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bootleg, arkanoid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bootleg_map)
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 81da104b6eb..6974bce66a6 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -794,314 +794,314 @@ static MACHINE_RESET( armedf )
static MACHINE_CONFIG_START( terraf, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(terraf_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(terraf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- 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(12*8, (64-12)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ 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(12*8, (64-12)*8-1, 1*8, 31*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( terrafb, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(terrafb_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(terrafb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_CPU_ADD("extra", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(terrafb_extraz80_map)
- MDRV_CPU_IO_MAP(terrafb_extraz80_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("extra", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(terrafb_extraz80_map)
+ MCFG_CPU_IO_MAP(terrafb_extraz80_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- 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(12*8, (64-12)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ 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(12*8, (64-12)*8-1, 1*8, 31*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kodure, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(kodure_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(kodure_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( armedf, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(armedf_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(armedf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- 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(12*8, (64-12)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ 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(12*8, (64-12)*8-1, 1*8, 31*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cclimbr2, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(cclimbr2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( legion, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(legion_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(legion_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( legiono, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(legiono_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(legiono_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 5c6f5910572..21979ee71a3 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -843,68 +843,68 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( artmagic, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("tms", TMS34010, MASTER_CLOCK_40MHz)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_map)
+ MCFG_CPU_ADD("tms", TMS34010, MASTER_CLOCK_40MHz)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(tms_map)
- MDRV_MACHINE_START(artmagic)
- MDRV_MACHINE_RESET(artmagic)
- MDRV_QUANTUM_TIME(HZ(6000))
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(artmagic)
+ MCFG_MACHINE_RESET(artmagic)
+ MCFG_QUANTUM_TIME(HZ(6000))
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_START(artmagic)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(artmagic)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK_40MHz/6, 428, 0, 320, 313, 0, 256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_40MHz/6, 428, 0, 320, 313, 0, 256)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", MASTER_CLOCK_40MHz/3/10, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK_40MHz/3/10, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cheesech, artmagic )
- MDRV_SOUND_MODIFY("oki")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_MODIFY("oki")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( stonebal, artmagic )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(stonebal_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(stonebal_map)
- MDRV_CPU_MODIFY("tms")
- MDRV_CPU_PROGRAM_MAP(stonebal_tms_map)
+ MCFG_CPU_MODIFY("tms")
+ MCFG_CPU_PROGRAM_MAP(stonebal_tms_map)
- MDRV_SOUND_MODIFY("oki")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_MODIFY("oki")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( shtstar, artmagic )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shtstar_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(shtstar_map)
/* sub cpu*/
- MDRV_CPU_ADD("subcpu", M68000, MASTER_CLOCK_25MHz/2)
- MDRV_CPU_PROGRAM_MAP(shtstar_subcpu_map)
+ MCFG_CPU_ADD("subcpu", M68000, MASTER_CLOCK_25MHz/2)
+ MCFG_CPU_PROGRAM_MAP(shtstar_subcpu_map)
/*gun board cpu*/
- MDRV_CPU_ADD("guncpu", I80C31, 6000000)
- MDRV_CPU_IO_MAP(shtstar_guncpu_io_map)
- MDRV_CPU_PROGRAM_MAP(shtstar_guncpu_map)
+ MCFG_CPU_ADD("guncpu", I80C31, 6000000)
+ MCFG_CPU_IO_MAP(shtstar_guncpu_io_map)
+ MCFG_CPU_PROGRAM_MAP(shtstar_guncpu_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 190b1fa89c8..144a3c8e723 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -354,41 +354,41 @@ static MACHINE_RESET( ashnojoe )
static MACHINE_CONFIG_START( ashnojoe, ashnojoe_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(ashnojoe_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(ashnojoe_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_START(ashnojoe)
- MDRV_MACHINE_RESET(ashnojoe)
+ MCFG_MACHINE_START(ashnojoe)
+ MCFG_MACHINE_RESET(ashnojoe)
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(14*8, 50*8-1, 3*8, 29*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(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, 50*8-1, 3*8, 29*8-1)
- MDRV_GFXDECODE(ashnojoe)
- MDRV_PALETTE_LENGTH(0x1000/2)
+ MCFG_GFXDECODE(ashnojoe)
+ MCFG_PALETTE_LENGTH(0x1000/2)
- MDRV_VIDEO_START(ashnojoe)
- MDRV_VIDEO_UPDATE(ashnojoe)
+ MCFG_VIDEO_START(ashnojoe)
+ MCFG_VIDEO_UPDATE(ashnojoe)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( scessjoe )
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 2b943951978..81822c4d092 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -297,45 +297,45 @@ static MACHINE_RESET( asterix )
static MACHINE_CONFIG_START( asterix, asterix_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", asterix_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", asterix_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(asterix)
- MDRV_MACHINE_RESET(asterix)
+ MCFG_MACHINE_START(asterix)
+ MCFG_MACHINE_RESET(asterix)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* 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(14*8, (64-14)*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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(asterix)
+ MCFG_VIDEO_UPDATE(asterix)
- MDRV_K056832_ADD("k056832", asterix_k056832_intf)
- MDRV_K053244_ADD("k053244", asterix_k05324x_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K056832_ADD("k056832", asterix_k056832_intf)
+ MCFG_K053244_ADD("k053244", asterix_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("k053260", K053260, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 094d21450b5..42369ba1d9e 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -612,75 +612,75 @@ static const pokey_interface pokey_config =
static MACHINE_CONFIG_START( asteroid, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(asteroid_map)
- MDRV_CPU_PERIODIC_INT(asteroid_interrupt, (double)MASTER_CLOCK/4096/12)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(asteroid_map)
+ MCFG_CPU_PERIODIC_INT(asteroid_interrupt, (double)MASTER_CLOCK/4096/12)
- MDRV_MACHINE_RESET(asteroid)
+ MCFG_MACHINE_RESET(asteroid)
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(400,300)
- MDRV_SCREEN_VISIBLE_AREA(522, 1566, 394, 1182)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(400,300)
+ MCFG_SCREEN_VISIBLE_AREA(522, 1566, 394, 1182)
- MDRV_VIDEO_START(dvg)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(dvg)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(asteroid)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(asteroid)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( asterock, asteroid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PERIODIC_INT(asterock_interrupt, (double)MASTER_CLOCK/4096/12)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PERIODIC_INT(asterock_interrupt, (double)MASTER_CLOCK/4096/12)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( astdelux, asteroid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astdelux_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(astdelux_map)
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
/* sound hardware */
- MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(astdelux)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(astdelux)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( llander, asteroid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(llander_map)
- MDRV_CPU_PERIODIC_INT(llander_interrupt, (double)MASTER_CLOCK/4096/12)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(llander_map)
+ MCFG_CPU_PERIODIC_INT(llander_interrupt, (double)MASTER_CLOCK/4096/12)
- MDRV_MACHINE_RESET(avgdvg)
+ MCFG_MACHINE_RESET(avgdvg)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(40)
- MDRV_SCREEN_VISIBLE_AREA(522, 1566, 270, 1070)
- MDRV_VIDEO_START(dvg)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(40)
+ MCFG_SCREEN_VISIBLE_AREA(522, 1566, 270, 1070)
+ MCFG_VIDEO_START(dvg)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(llander)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(llander)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index bc27811fd1d..cf095cde7a7 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -587,67 +587,67 @@ static const samples_interface astinvad_samples_interface =
static MACHINE_CONFIG_START( kamikaze, astinvad_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(kamikaze_map)
- MDRV_CPU_IO_MAP(kamikaze_portmap)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(kamikaze_map)
+ MCFG_CPU_IO_MAP(kamikaze_portmap)
- MDRV_MACHINE_START(kamikaze)
- MDRV_MACHINE_RESET(kamikaze)
+ MCFG_MACHINE_START(kamikaze)
+ MCFG_MACHINE_RESET(kamikaze)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
/* video hardware */
- MDRV_VIDEO_UPDATE(astinvad)
+ MCFG_VIDEO_UPDATE(astinvad)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 32, 256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 32, 256)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(astinvad_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(astinvad_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spcking2, kamikaze )
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 16, 240)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 16, 240)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spaceint, astinvad_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */
- MDRV_CPU_PROGRAM_MAP(spaceint_map)
- MDRV_CPU_IO_MAP(spaceint_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */
+ MCFG_CPU_PROGRAM_MAP(spaceint_map)
+ MCFG_CPU_IO_MAP(spaceint_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(spaceint)
- MDRV_MACHINE_RESET(spaceint)
+ MCFG_MACHINE_START(spaceint)
+ MCFG_MACHINE_RESET(spaceint)
/* video hardware */
- MDRV_VIDEO_START(spaceint)
- MDRV_VIDEO_UPDATE(spaceint)
+ MCFG_VIDEO_START(spaceint)
+ MCFG_VIDEO_UPDATE(spaceint)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(astinvad_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(astinvad_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 06383d74a2f..4385a46cd7b 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -1274,59 +1274,59 @@ static const z80_daisy_config tenpin_daisy_chain[] =
static MACHINE_CONFIG_START( astrocade_base, astrocde_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4)
+ MCFG_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4)
/* each game has its own map */
- MDRV_MACHINE_START(astrocde)
+ MCFG_MACHINE_START(astrocde)
/* video hardware */
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(ASTROCADE_CLOCK, 455, 0, 352, 262, 0, 240)
- MDRV_SCREEN_DEFAULT_POSITION(1.1, 0.0, 1.18, -0.018) /* clip out borders */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(ASTROCADE_CLOCK, 455, 0, 352, 262, 0, 240)
+ MCFG_SCREEN_DEFAULT_POSITION(1.1, 0.0, 1.18, -0.018) /* clip out borders */
- MDRV_PALETTE_INIT(astrocde)
- MDRV_VIDEO_START(astrocde)
- MDRV_VIDEO_UPDATE(astrocde)
+ MCFG_PALETTE_INIT(astrocde)
+ MCFG_VIDEO_START(astrocde)
+ MCFG_VIDEO_UPDATE(astrocde)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( astrocade_16color_base, astrocade_base )
/* basic machine hardware */
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(profpac)
- MDRV_VIDEO_START(profpac)
- MDRV_VIDEO_UPDATE(profpac)
+ MCFG_PALETTE_INIT(profpac)
+ MCFG_VIDEO_START(profpac)
+ MCFG_VIDEO_UPDATE(profpac)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( astrocade_mono_sound )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( astrocade_stereo_sound )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1340,147 +1340,147 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( seawolf2, astrocade_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(seawolf2_map)
- MDRV_CPU_IO_MAP(port_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(seawolf2_map)
+ MCFG_CPU_IO_MAP(port_map)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(seawolf2_samples_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(4, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(5, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(6, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(7, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(8, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(9, "rspeaker", 0.25)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(seawolf2_samples_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(4, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(5, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(6, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(7, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(8, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(9, "rspeaker", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ebases, astrocade_base )
- MDRV_FRAGMENT_ADD(astrocade_mono_sound)
+ MCFG_FRAGMENT_ADD(astrocade_mono_sound)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ebases_map)
- MDRV_CPU_IO_MAP(port_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ebases_map)
+ MCFG_CPU_IO_MAP(port_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spacezap, astrocade_base )
- MDRV_FRAGMENT_ADD(astrocade_mono_sound)
+ MCFG_FRAGMENT_ADD(astrocade_mono_sound)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spacezap_map)
- MDRV_CPU_IO_MAP(port_map_mono_pattern)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spacezap_map)
+ MCFG_CPU_IO_MAP(port_map_mono_pattern)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wow, astrocade_base )
- MDRV_FRAGMENT_ADD(astrocade_stereo_sound)
+ MCFG_FRAGMENT_ADD(astrocade_stereo_sound)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wow_map)
- MDRV_CPU_IO_MAP(port_map_stereo_pattern)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wow_map)
+ MCFG_CPU_IO_MAP(port_map_stereo_pattern)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_DEFAULT_POSITION(1.0, 0.0, 1.0, 0.0) /* adjusted to match screenshots */
-// MDRV_SCREEN_DEFAULT_POSITION(1.066, -0.004, 1.048, -0.026) /* adjusted to match flyer */
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_DEFAULT_POSITION(1.0, 0.0, 1.0, 0.0) /* adjusted to match screenshots */
+// MCFG_SCREEN_DEFAULT_POSITION(1.066, -0.004, 1.048, -0.026) /* adjusted to match flyer */
/* sound hardware */
- MDRV_SPEAKER_ADD("center", 0.0, 0.0, 1.0)
+ MCFG_SPEAKER_ADD("center", 0.0, 0.0, 1.0)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(wow_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "center", 0.85)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(wow_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "center", 0.85)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gorf, astrocade_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wow_map)
- MDRV_CPU_IO_MAP(port_map_stereo_pattern)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wow_map)
+ MCFG_CPU_IO_MAP(port_map_stereo_pattern)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_DEFAULT_POSITION(1.0, 0.0, 1.0, 0.0) /* adjusted to match flyer */
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_DEFAULT_POSITION(1.0, 0.0, 1.0, 0.0) /* adjusted to match flyer */
/* sound hardware */
- MDRV_SPEAKER_ADD("upper", 0.0, 0.0, 1.0)
- MDRV_SPEAKER_ADD("lower", 0.0, -0.5, 1.0)
+ MCFG_SPEAKER_ADD("upper", 0.0, 0.0, 1.0)
+ MCFG_SPEAKER_ADD("lower", 0.0, -0.5, 1.0)
- MDRV_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "upper", 1.0)
+ MCFG_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "upper", 1.0)
- MDRV_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lower", 1.0)
+ MCFG_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lower", 1.0)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gorf_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "upper", 0.85)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gorf_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "upper", 0.85)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( robby, astrocade_base )
- MDRV_FRAGMENT_ADD(astrocade_stereo_sound)
+ MCFG_FRAGMENT_ADD(astrocade_stereo_sound)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(robby_map)
- MDRV_CPU_IO_MAP(port_map_stereo_pattern)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(robby_map)
+ MCFG_CPU_IO_MAP(port_map_stereo_pattern)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( profpac, astrocade_16color_base )
- MDRV_FRAGMENT_ADD(astrocade_stereo_sound)
+ MCFG_FRAGMENT_ADD(astrocade_stereo_sound)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(profpac_map)
- MDRV_CPU_IO_MAP(port_map_16col_pattern)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(profpac_map)
+ MCFG_CPU_IO_MAP(port_map_16col_pattern)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( demndrgn, astrocade_16color_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(demndrgn_map)
- MDRV_CPU_IO_MAP(port_map_16col_pattern_nosound)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(demndrgn_map)
+ MCFG_CPU_IO_MAP(port_map_16col_pattern_nosound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tenpindx, astrocade_16color_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(profpac_map)
- MDRV_CPU_IO_MAP(port_map_16col_pattern_nosound)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(profpac_map)
+ MCFG_CPU_IO_MAP(port_map_16col_pattern_nosound)
- MDRV_CPU_ADD("sub", Z80, ASTROCADE_CLOCK/4) /* real clock unknown */
- MDRV_CPU_CONFIG(tenpin_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(tenpin_sub_map)
- MDRV_CPU_IO_MAP(tenpin_sub_io_map)
+ MCFG_CPU_ADD("sub", Z80, ASTROCADE_CLOCK/4) /* real clock unknown */
+ MCFG_CPU_CONFIG(tenpin_daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(tenpin_sub_map)
+ MCFG_CPU_IO_MAP(tenpin_sub_io_map)
- MDRV_Z80CTC_ADD("ctc", ASTROCADE_CLOCK/4 /* same as "sub" */, ctc_intf)
+ MCFG_Z80CTC_ADD("ctc", ASTROCADE_CLOCK/4 /* same as "sub" */, ctc_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8912, ASTROCADE_CLOCK/4) /* real clock unknown */
- MDRV_SOUND_CONFIG(ay8912_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8912, ASTROCADE_CLOCK/4) /* real clock unknown */
+ MCFG_SOUND_CONFIG(ay8912_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 2c1c80b06e6..ccf2b07e8bb 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -462,39 +462,39 @@ static const UINT16 showhand_default_eeprom[15] = {0x0001,0x0007,0x000a,0x0003,0
static MACHINE_CONFIG_START( showhand, astrocorp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(showhand_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(showhand_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DATA(showhand_default_eeprom, sizeof(showhand_default_eeprom))
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DATA(showhand_default_eeprom, sizeof(showhand_default_eeprom))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58.846) // measured on pcb
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58.846) // measured on pcb
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(astrocorp)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(astrocorp)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(astrocorp)
- MDRV_VIDEO_UPDATE(astrocorp)
+ MCFG_VIDEO_START(astrocorp)
+ MCFG_VIDEO_UPDATE(astrocorp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz/20, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz/20, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( showhanc, showhand )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(showhanc_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(showhanc_map)
MACHINE_CONFIG_END
@@ -510,41 +510,41 @@ static INTERRUPT_GEN( skilldrp_irq )
static MACHINE_CONFIG_START( skilldrp, astrocorp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // JX-1689F1028N GRX586.V5
- MDRV_CPU_PROGRAM_MAP(skilldrp_map)
- MDRV_CPU_VBLANK_INT_HACK(skilldrp_irq, 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // JX-1689F1028N GRX586.V5
+ MCFG_CPU_PROGRAM_MAP(skilldrp_map)
+ MCFG_CPU_VBLANK_INT_HACK(skilldrp_irq, 2)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
- MDRV_TICKET_DISPENSER_ADD("hopper", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
+ MCFG_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
+ MCFG_TICKET_DISPENSER_ADD("hopper", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58.846)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(0x200, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x200-1, 0, 0xf0-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58.846)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(0x200, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x200-1, 0, 0xf0-1)
- MDRV_GFXDECODE(astrocorp)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(astrocorp)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(astrocorp)
- MDRV_VIDEO_UPDATE(astrocorp)
+ MCFG_VIDEO_START(astrocorp)
+ MCFG_VIDEO_UPDATE(astrocorp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_24MHz/24, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/24, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( speeddrp, skilldrp )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(speeddrp_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(speeddrp_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index 129627f3cc8..08f200ae670 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -958,31 +958,31 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( base, astrof_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MDRV_TIMER_ADD_SCANLINE("vblank", irq_callback, "screen", VBSTART, 0)
+ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_TIMER_ADD_SCANLINE("vblank", irq_callback, "screen", VBSTART, 0)
/* video hardware */
- MDRV_VIDEO_START(astrof)
+ MCFG_VIDEO_START(astrof)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( astrof, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astrof_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(astrof_map)
- MDRV_MACHINE_START(astrof)
+ MCFG_MACHINE_START(astrof)
/* video hardware */
- MDRV_VIDEO_UPDATE(astrof)
+ MCFG_VIDEO_UPDATE(astrof)
/* audio hardware */
- MDRV_FRAGMENT_ADD(astrof_audio)
+ MCFG_FRAGMENT_ADD(astrof_audio)
MACHINE_CONFIG_END
@@ -990,40 +990,40 @@ static MACHINE_CONFIG_DERIVED( abattle, astrof )
/* basic machine hardware */
- MDRV_MACHINE_START(abattle)
- MDRV_MACHINE_RESET(abattle)
+ MCFG_MACHINE_START(abattle)
+ MCFG_MACHINE_RESET(abattle)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spfghmk2, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spfghmk2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spfghmk2_map)
- MDRV_MACHINE_START(spfghmk2)
+ MCFG_MACHINE_START(spfghmk2)
/* video hardware */
- MDRV_VIDEO_UPDATE(astrof)
+ MCFG_VIDEO_UPDATE(astrof)
/* audio hardware */
- MDRV_FRAGMENT_ADD(spfghmk2_audio)
+ MCFG_FRAGMENT_ADD(spfghmk2_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tomahawk, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tomahawk_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tomahawk_map)
- MDRV_MACHINE_START(tomahawk)
+ MCFG_MACHINE_START(tomahawk)
/* video hardware */
- MDRV_VIDEO_UPDATE(tomahawk)
+ MCFG_VIDEO_UPDATE(tomahawk)
/* audio hardware */
- MDRV_FRAGMENT_ADD(tomahawk_audio)
+ MCFG_FRAGMENT_ADD(tomahawk_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index a1e9801826d..9f9a6fc8c32 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -895,282 +895,282 @@ static const tc0140syt_interface asuka_tc0140syt_intf =
static MACHINE_CONFIG_START( bonzeadv, asuka_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* checked on PCB */
- MDRV_CPU_PROGRAM_MAP(bonzeadv_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* checked on PCB */
+ MCFG_CPU_PROGRAM_MAP(bonzeadv_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,4000000) /* sound CPU, also required for test mode */
- MDRV_CPU_PROGRAM_MAP(bonzeadv_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80,4000000) /* sound CPU, also required for test mode */
+ MCFG_CPU_PROGRAM_MAP(bonzeadv_z80_map)
- MDRV_MACHINE_START(asuka)
- MDRV_MACHINE_RESET(asuka)
+ MCFG_MACHINE_START(asuka)
+ MCFG_MACHINE_RESET(asuka)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 31*8-1)
- MDRV_GFXDECODE(asuka)
- MDRV_PALETTE_LENGTH(4096)
-
- MDRV_VIDEO_EOF(asuka)
- MDRV_VIDEO_UPDATE(bonzeadv)
-
- MDRV_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
- MDRV_TC0100SCN_ADD("tc0100scn", asuka_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 31*8-1)
+ MCFG_GFXDECODE(asuka)
+ MCFG_PALETTE_LENGTH(4096)
+
+ MCFG_VIDEO_EOF(asuka)
+ MCFG_VIDEO_UPDATE(bonzeadv)
+
+ MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", asuka_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( asuka, asuka_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(asuka_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(asuka_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(z80_map)
- MDRV_MACHINE_START(asuka)
- MDRV_MACHINE_RESET(asuka)
+ MCFG_MACHINE_START(asuka)
+ MCFG_MACHINE_RESET(asuka)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", asuka_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", asuka_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(asuka)
- MDRV_PALETTE_LENGTH(4096)
-
- MDRV_VIDEO_EOF(asuka)
- MDRV_VIDEO_UPDATE(asuka)
-
- MDRV_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
- MDRV_TC0100SCN_ADD("tc0100scn", asuka_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
+ MCFG_GFXDECODE(asuka)
+ MCFG_PALETTE_LENGTH(4096)
+
+ MCFG_VIDEO_EOF(asuka)
+ MCFG_VIDEO_UPDATE(asuka)
+
+ MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", asuka_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cadash, asuka_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cadash_map)
- MDRV_CPU_VBLANK_INT("screen", cadash_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cadash_map)
+ MCFG_CPU_VBLANK_INT("screen", cadash_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cadash_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cadash_z80_map)
- MDRV_CPU_ADD("subcpu", Z180, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cadash_sub_map)
- MDRV_CPU_IO_MAP(cadash_sub_io)
+ MCFG_CPU_ADD("subcpu", Z180, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(cadash_sub_map)
+ MCFG_CPU_IO_MAP(cadash_sub_io)
- MDRV_MACHINE_START(asuka)
- MDRV_MACHINE_RESET(asuka)
+ MCFG_MACHINE_START(asuka)
+ MCFG_MACHINE_RESET(asuka)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", asuka_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", asuka_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(asuka)
- MDRV_PALETTE_LENGTH(4096)
-
- MDRV_VIDEO_EOF(asuka)
- MDRV_VIDEO_UPDATE(bonzeadv)
-
- MDRV_PC090OJ_ADD("pc090oj", cadash_pc090oj_intf)
- MDRV_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
+ MCFG_GFXDECODE(asuka)
+ MCFG_PALETTE_LENGTH(4096)
+
+ MCFG_VIDEO_EOF(asuka)
+ MCFG_VIDEO_UPDATE(bonzeadv)
+
+ MCFG_PC090OJ_ADD("pc090oj", cadash_pc090oj_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mofflott, asuka_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(asuka_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(asuka_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_map)
- MDRV_MACHINE_START(asuka)
- MDRV_MACHINE_RESET(asuka)
+ MCFG_MACHINE_START(asuka)
+ MCFG_MACHINE_RESET(asuka)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", asuka_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", asuka_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(asuka)
- MDRV_PALETTE_LENGTH(4096) /* only Mofflott uses full palette space */
-
- MDRV_VIDEO_EOF(asuka)
- MDRV_VIDEO_UPDATE(asuka)
-
- MDRV_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
- MDRV_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
+ MCFG_GFXDECODE(asuka)
+ MCFG_PALETTE_LENGTH(4096) /* only Mofflott uses full palette space */
+
+ MCFG_VIDEO_EOF(asuka)
+ MCFG_VIDEO_UPDATE(asuka)
+
+ MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( galmedes, asuka_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(asuka_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(asuka_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cadash_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(cadash_z80_map)
- MDRV_MACHINE_START(asuka)
- MDRV_MACHINE_RESET(asuka)
+ MCFG_MACHINE_START(asuka)
+ MCFG_MACHINE_RESET(asuka)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", asuka_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", asuka_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(asuka)
- MDRV_PALETTE_LENGTH(4096) /* only Mofflott uses full palette space */
-
- MDRV_VIDEO_EOF(asuka)
- MDRV_VIDEO_UPDATE(asuka)
-
- MDRV_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
- MDRV_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
+ MCFG_GFXDECODE(asuka)
+ MCFG_PALETTE_LENGTH(4096) /* only Mofflott uses full palette space */
+
+ MCFG_VIDEO_EOF(asuka)
+ MCFG_VIDEO_UPDATE(asuka)
+
+ MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( eto, asuka_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(eto_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(eto_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cadash_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(cadash_z80_map)
- MDRV_MACHINE_START(asuka)
- MDRV_MACHINE_RESET(asuka)
+ MCFG_MACHINE_START(asuka)
+ MCFG_MACHINE_RESET(asuka)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", asuka_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", asuka_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(asuka)
- MDRV_PALETTE_LENGTH(4096)
-
- MDRV_VIDEO_EOF(asuka)
- MDRV_VIDEO_UPDATE(asuka)
-
- MDRV_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
- MDRV_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
+ MCFG_GFXDECODE(asuka)
+ MCFG_PALETTE_LENGTH(4096)
+
+ MCFG_VIDEO_EOF(asuka)
+ MCFG_VIDEO_UPDATE(asuka)
+
+ MCFG_PC090OJ_ADD("pc090oj", asuka_pc090oj_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", cadash_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", asuka_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", asuka_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index dc6635ea4e0..09bd708137c 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -556,71 +556,71 @@ static MACHINE_RESET( atarifb )
static MACHINE_CONFIG_START( atarifb, atarifb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 750000)
- MDRV_CPU_PROGRAM_MAP(atarifb_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
+ MCFG_CPU_ADD("maincpu", M6502, 750000)
+ MCFG_CPU_PROGRAM_MAP(atarifb_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
- MDRV_MACHINE_START(atarifb)
- MDRV_MACHINE_RESET(atarifb)
+ MCFG_MACHINE_START(atarifb)
+ MCFG_MACHINE_RESET(atarifb)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2037) /* 16.3ms * 1/8 = 2037.5. Is it 1/8th or 3/32nds? (1528?) */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(38*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 38*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(atarifb)
- MDRV_PALETTE_LENGTH(12)
-
- MDRV_PALETTE_INIT(atarifb)
- MDRV_VIDEO_START(atarifb)
- MDRV_VIDEO_UPDATE(atarifb)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2037) /* 16.3ms * 1/8 = 2037.5. Is it 1/8th or 3/32nds? (1528?) */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(38*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 38*8-1, 1*8, 31*8-1)
+ MCFG_GFXDECODE(atarifb)
+ MCFG_PALETTE_LENGTH(12)
+
+ MCFG_PALETTE_INIT(atarifb)
+ MCFG_VIDEO_START(atarifb)
+ MCFG_VIDEO_UPDATE(atarifb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(atarifb)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.18)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(atarifb)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.18)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( atarifb4, atarifb )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(atarifb4_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(atarifb4_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( abaseb, atarifb )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(abaseb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(abaseb_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(abaseb)
+ MCFG_VIDEO_UPDATE(abaseb)
/* sound hardware */
- MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(abaseb)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.24)
+ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(abaseb)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.24)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( soccer, atarifb )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(soccer_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(soccer_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 38*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(soccer)
- MDRV_VIDEO_UPDATE(soccer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 38*8-1, 2*8, 32*8-1)
+ MCFG_GFXDECODE(soccer)
+ MCFG_VIDEO_UPDATE(soccer)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 562b9fe3775..91c60f4dcb6 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -410,30 +410,30 @@ GFXDECODE_END
static MACHINE_CONFIG_START( atarig1, atarig1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(atarig1)
- MDRV_MACHINE_RESET(atarig1)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(atarig1)
+ MCFG_MACHINE_RESET(atarig1)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(atarig1)
- MDRV_PALETTE_LENGTH(1280)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(atarig1)
+ MCFG_PALETTE_LENGTH(1280)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(atarig1)
- MDRV_VIDEO_EOF(atarirle)
- MDRV_VIDEO_UPDATE(atarig1)
+ MCFG_VIDEO_START(atarig1)
+ MCFG_VIDEO_EOF(atarirle)
+ MCFG_VIDEO_UPDATE(atarig1)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_ii_mono)
+ MCFG_FRAGMENT_ADD(jsa_ii_mono)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 35d3753f515..c6171d43358 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -515,34 +515,34 @@ GFXDECODE_END
static MACHINE_CONFIG_START( atarig42, atarig42_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
/* ASIC65 */
- MDRV_FRAGMENT_ADD(asic65)
+ MCFG_FRAGMENT_ADD(asic65)
- MDRV_MACHINE_START(atarig42)
- MDRV_MACHINE_RESET(atarig42)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(atarig42)
+ MCFG_MACHINE_RESET(atarig42)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(atarig42)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(atarig42)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(atarig42)
- MDRV_VIDEO_EOF(atarirle)
- MDRV_VIDEO_UPDATE(atarig42)
+ MCFG_VIDEO_START(atarig42)
+ MCFG_VIDEO_EOF(atarirle)
+ MCFG_VIDEO_UPDATE(atarig42)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_iii_mono)
+ MCFG_FRAGMENT_ADD(jsa_iii_mono)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index 75b8791408d..48a0924ee7a 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -793,32 +793,32 @@ GFXDECODE_END
static MACHINE_CONFIG_START( atarigt, atarigt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_50MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_CPU_PERIODIC_INT(atarigen_scanline_int_gen, 250)
+ MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_50MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_PERIODIC_INT(atarigen_scanline_int_gen, 250)
- MDRV_MACHINE_START(atarigt)
- MDRV_MACHINE_RESET(atarigt)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(atarigt)
+ MCFG_MACHINE_RESET(atarigt)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(atarigt)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(atarigt)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
/* note: these parameters are from published specs, not derived */
/* the board uses a pair of GALs to determine H and V parameters */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(atarigt)
- MDRV_VIDEO_EOF(atarirle)
- MDRV_VIDEO_UPDATE(atarigt)
+ MCFG_VIDEO_START(atarigt)
+ MCFG_VIDEO_EOF(atarirle)
+ MCFG_VIDEO_UPDATE(atarigt)
/* sound hardware */
- MDRV_FRAGMENT_ADD(cage)
+ MCFG_FRAGMENT_ADD(cage)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index d3b2e1b00cf..6c4822f528a 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -1391,31 +1391,31 @@ GFXDECODE_END
static MACHINE_CONFIG_START( atarigx2, atarigx2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(atarigx2)
- MDRV_MACHINE_RESET(atarigx2)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(atarigx2)
+ MCFG_MACHINE_RESET(atarigx2)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(atarigx2)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(atarigx2)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a pair of GALs to determine H and V parameters */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(atarigx2)
- MDRV_VIDEO_EOF(atarirle)
- MDRV_VIDEO_UPDATE(atarigx2)
+ MCFG_VIDEO_START(atarigx2)
+ MCFG_VIDEO_EOF(atarirle)
+ MCFG_VIDEO_UPDATE(atarigx2)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_iiis_stereo)
+ MCFG_FRAGMENT_ADD(jsa_iiis_stereo)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 35eaf7e6727..df457167287 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -763,54 +763,54 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( atarisy1, atarisy1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(atarisy1)
- MDRV_MACHINE_RESET(atarisy1)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(atarisy1)
+ MCFG_MACHINE_RESET(atarisy1)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
- MDRV_TIMER_ADD("joystick_timer", delayed_joystick_int)
- MDRV_TIMER_ADD("scan_timer", atarisy1_int3_callback)
- MDRV_TIMER_ADD("int3off_timer", atarisy1_int3off_callback)
- MDRV_TIMER_ADD("yreset_timer", atarisy1_reset_yscroll_callback)
+ MCFG_TIMER_ADD("joystick_timer", delayed_joystick_int)
+ MCFG_TIMER_ADD("scan_timer", atarisy1_int3_callback)
+ MCFG_TIMER_ADD("int3off_timer", atarisy1_int3off_callback)
+ MCFG_TIMER_ADD("yreset_timer", atarisy1_reset_yscroll_callback)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(atarisy1)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(atarisy1)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* video timing comes from an 82S163 (H) and an 82S129 (V) */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(atarisy1)
- MDRV_VIDEO_UPDATE(atarisy1)
+ MCFG_VIDEO_START(atarisy1)
+ MCFG_VIDEO_UPDATE(atarisy1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MDRV_SOUND_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
/* via */
- MDRV_VIA6522_ADD("via6522_0", 0, via_interface)
+ MCFG_VIA6522_ADD("via6522_0", 0, via_interface)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index 32844a934e3..ec2ca776b96 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -1145,48 +1145,48 @@ static const struct t11_setup t11_data =
static MACHINE_CONFIG_START( atarisy2, atarisy2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", T11, MASTER_CLOCK/2)
- MDRV_CPU_CONFIG(t11_data)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_int)
+ MCFG_CPU_ADD("maincpu", T11, MASTER_CLOCK/2)
+ MCFG_CPU_CONFIG(t11_data)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_int)
- MDRV_CPU_ADD("soundcpu", M6502, SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)MASTER_CLOCK/2/16/16/16/10)
+ MCFG_CPU_ADD("soundcpu", M6502, SOUND_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)MASTER_CLOCK/2/16/16/16/10)
- MDRV_MACHINE_START(atarisy2)
- MDRV_MACHINE_RESET(atarisy2)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(atarisy2)
+ MCFG_MACHINE_RESET(atarisy2)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(atarisy2)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(atarisy2)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 640, 0, 512, 416, 0, 384)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 640, 0, 512, 416, 0, 384)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(atarisy2)
- MDRV_VIDEO_UPDATE(atarisy2)
+ MCFG_VIDEO_START(atarisy2)
+ MCFG_VIDEO_UPDATE(atarisy2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
-
- MDRV_SOUND_ADD("pokey1", POKEY, SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.35)
-
- MDRV_SOUND_ADD("pokey2", POKEY, SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.35)
-
- MDRV_SOUND_ADD("tms", TMS5220C, MASTER_CLOCK/4/4/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
+
+ MCFG_SOUND_ADD("pokey1", POKEY, SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.35)
+
+ MCFG_SOUND_ADD("pokey2", POKEY, SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.35)
+
+ MCFG_SOUND_ADD("tms", TMS5220C, MASTER_CLOCK/4/4/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
@@ -1195,7 +1195,7 @@ static MACHINE_CONFIG_DERIVED( sprint, atarisy2 )
/* basic machine hardware */
/* sound hardware */
- MDRV_DEVICE_REMOVE("tms")
+ MCFG_DEVICE_REMOVE("tms")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c
index 94d974e72dc..d30bf7efe27 100644
--- a/src/mame/drivers/atarisy4.c
+++ b/src/mame/drivers/atarisy4.c
@@ -695,34 +695,34 @@ INPUT_PORTS_END
*************************************/
static MACHINE_CONFIG_START( atarisy4, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_int)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_int)
- MDRV_CPU_ADD("dsp0", TMS32010, 16000000)
- MDRV_CPU_PROGRAM_MAP(dsp0_map)
- MDRV_CPU_IO_MAP(dsp0_io_map)
+ MCFG_CPU_ADD("dsp0", TMS32010, 16000000)
+ MCFG_CPU_PROGRAM_MAP(dsp0_map)
+ MCFG_CPU_IO_MAP(dsp0_io_map)
- MDRV_VIDEO_RESET(atarisy4)
- MDRV_MACHINE_RESET(atarisy4)
+ MCFG_VIDEO_RESET(atarisy4)
+ MCFG_MACHINE_RESET(atarisy4)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(32000000/2, 660, 0, 512, 404, 0, 384)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(32000000/2, 660, 0, 512, 404, 0, 384)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(atarisy4)
- MDRV_VIDEO_UPDATE(atarisy4)
+ MCFG_VIDEO_START(atarisy4)
+ MCFG_VIDEO_UPDATE(atarisy4)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( airrace, atarisy4 )
- MDRV_CPU_ADD("dsp1", TMS32010, 16000000)
- MDRV_CPU_PROGRAM_MAP(dsp1_map)
- MDRV_CPU_IO_MAP(dsp1_io_map)
+ MCFG_CPU_ADD("dsp1", TMS32010, 16000000)
+ MCFG_CPU_PROGRAM_MAP(dsp1_map)
+ MCFG_CPU_IO_MAP(dsp1_io_map)
- MDRV_MACHINE_RESET(airrace)
+ MCFG_MACHINE_RESET(airrace)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 3ca26cec9a5..6b4460d355c 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -313,32 +313,32 @@ static const eeprom_interface eeprom_intf =
static MACHINE_CONFIG_START( ataxx, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("master", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(master_map_program)
- MDRV_CPU_IO_MAP(master_map_io)
+ MCFG_CPU_ADD("master", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(master_map_program)
+ MCFG_CPU_IO_MAP(master_map_io)
- MDRV_CPU_ADD("slave", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(slave_map_program)
- MDRV_CPU_IO_MAP(slave_map_io)
+ MCFG_CPU_ADD("slave", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(slave_map_program)
+ MCFG_CPU_IO_MAP(slave_map_io)
- MDRV_CPU_ADD("audiocpu", I80186, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(leland_80186_map_program)
- MDRV_CPU_IO_MAP(ataxx_80186_map_io)
+ MCFG_CPU_ADD("audiocpu", I80186, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(leland_80186_map_program)
+ MCFG_CPU_IO_MAP(ataxx_80186_map_io)
- MDRV_MACHINE_START(ataxx)
- MDRV_MACHINE_RESET(ataxx)
+ MCFG_MACHINE_START(ataxx)
+ MCFG_MACHINE_RESET(ataxx)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_NVRAM_ADD_0FILL("battery")
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_ADD_0FILL("battery")
/* video hardware */
- MDRV_FRAGMENT_ADD(ataxx_video)
+ MCFG_FRAGMENT_ADD(ataxx_video)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("custom", LELAND_80186, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("custom", LELAND_80186, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -347,9 +347,9 @@ static MACHINE_CONFIG_DERIVED( wsf, ataxx )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index 3b1d6e95a2b..a0bf900dd03 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -343,73 +343,73 @@ static const pokey_interface pokey_interface_2 =
static MACHINE_CONFIG_START( atetris, atetris_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(atetris)
- MDRV_MACHINE_RESET(atetris)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(atetris)
+ MCFG_MACHINE_RESET(atetris)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_GFXDECODE(atetris)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(atetris)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(atetris)
- MDRV_VIDEO_UPDATE(atetris)
+ MCFG_VIDEO_START(atetris)
+ MCFG_VIDEO_UPDATE(atetris)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( atetrisb2, atetris_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,BOOTLEG_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(atetrisb2_map)
+ MCFG_CPU_ADD("maincpu", M6502,BOOTLEG_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(atetrisb2_map)
- MDRV_MACHINE_START(atetris)
- MDRV_MACHINE_RESET(atetris)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(atetris)
+ MCFG_MACHINE_RESET(atetris)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_GFXDECODE(atetris)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(atetris)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(atetris)
- MDRV_VIDEO_UPDATE(atetris)
+ MCFG_VIDEO_START(atetris)
+ MCFG_VIDEO_UPDATE(atetris)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, BOOTLEG_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76496, BOOTLEG_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76496, BOOTLEG_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76496, BOOTLEG_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn3", SN76496, BOOTLEG_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn3", SN76496, BOOTLEG_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index a662c29316f..997635dcf6b 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -192,27 +192,27 @@ static const mos6560_interface attckufo_6560_intf =
static MACHINE_CONFIG_START( attckufo, attckufo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 14318181/14)
- MDRV_CPU_PROGRAM_MAP(cpu_map)
- MDRV_CPU_PERIODIC_INT(attckufo_raster_interrupt, MOS656X_HRETRACERATE)
+ MCFG_CPU_ADD("maincpu", M6502, 14318181/14)
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_PERIODIC_INT(attckufo_raster_interrupt, MOS656X_HRETRACERATE)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(MOS6560_VRETRACERATE)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE((MOS6560_XSIZE + 7) & ~7, MOS6560_YSIZE)
- MDRV_SCREEN_VISIBLE_AREA(0, 23*8 - 1, 0, 22*8 - 1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(MOS6560_VRETRACERATE)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE((MOS6560_XSIZE + 7) & ~7, MOS6560_YSIZE)
+ MCFG_SCREEN_VISIBLE_AREA(0, 23*8 - 1, 0, 22*8 - 1)
- MDRV_PALETTE_LENGTH(ARRAY_LENGTH(attckufo_palette))
- MDRV_PALETTE_INIT(attckufo)
+ MCFG_PALETTE_LENGTH(ARRAY_LENGTH(attckufo_palette))
+ MCFG_PALETTE_INIT(attckufo)
- MDRV_VIDEO_UPDATE(attckufo)
+ MCFG_VIDEO_UPDATE(attckufo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_MOS656X_ADD("mos6560", attckufo_6560_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_MOS656X_ADD("mos6560", attckufo_6560_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( attckufo )
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 94adc089298..43512a97046 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -233,29 +233,29 @@ static MACHINE_RESET( avalnche )
static MACHINE_CONFIG_START( avalnche, avalnche_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,MASTER_CLOCK/16) /* clock input is the "2H" signal divided by two */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(avalnche_interrupt,8)
+ MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/16) /* clock input is the "2H" signal divided by two */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(avalnche_interrupt,8)
- MDRV_MACHINE_START(avalnche)
- MDRV_MACHINE_RESET(avalnche)
+ MCFG_MACHINE_START(avalnche)
+ MCFG_MACHINE_RESET(avalnche)
/* video hardware */
- MDRV_VIDEO_UPDATE(avalnche)
+ MCFG_VIDEO_UPDATE(avalnche)
- 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_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(avalnche)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(avalnche)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c
index c70e6734863..598bafda1ea 100644
--- a/src/mame/drivers/avt.c
+++ b/src/mame/drivers/avt.c
@@ -799,34 +799,34 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( avt, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
- MDRV_CPU_PROGRAM_MAP(avt_map)
- MDRV_CPU_IO_MAP(avt_portmap)
-// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
+ MCFG_CPU_PROGRAM_MAP(avt_map)
+ MCFG_CPU_IO_MAP(avt_portmap)
+// MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 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, 0*8, 32*8-1) /* 240x224 (through 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) /* 240x224 (through CRTC) */
- MDRV_GFXDECODE(avt)
+ MCFG_GFXDECODE(avt)
- MDRV_PALETTE_INIT(avt)
- MDRV_PALETTE_LENGTH(8*16)
+ MCFG_PALETTE_INIT(avt)
+ MCFG_PALETTE_LENGTH(8*16)
- MDRV_VIDEO_START(avt)
- MDRV_VIDEO_UPDATE(avt)
+ MCFG_VIDEO_START(avt)
+ MCFG_VIDEO_UPDATE(avt)
- MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) /* guess */
+ MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) /* guess */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, CPU_CLOCK/2) /* 1.25 MHz.?? */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, CPU_CLOCK/2) /* 1.25 MHz.?? */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 5a5047f92cb..288c283dbb8 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -148,40 +148,40 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( aztarac, aztarac_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(aztarac_snd_timed_irq, 100)
+ MCFG_CPU_ADD("audiocpu", Z80, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(aztarac_snd_timed_irq, 100)
- MDRV_MACHINE_RESET(aztarac)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(aztarac)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(40)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 768-1)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(40)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 768-1)
- MDRV_VIDEO_START(aztarac)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(aztarac)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay3", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay3", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay4", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay4", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 96ab9cecb52..07b407c7a63 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -480,45 +480,45 @@ static MACHINE_START( backfire )
static MACHINE_CONFIG_START( backfire, backfire_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
- MDRV_CPU_PROGRAM_MAP(backfire_map)
- MDRV_CPU_VBLANK_INT("lscreen", deco32_vbl_interrupt) /* or is it "rscreen?" */
+ MCFG_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
+ MCFG_CPU_PROGRAM_MAP(backfire_map)
+ MCFG_CPU_VBLANK_INT("lscreen", deco32_vbl_interrupt) /* or is it "rscreen?" */
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_MACHINE_START(backfire)
+ MCFG_MACHINE_START(backfire)
/* video hardware */
- MDRV_PALETTE_LENGTH(2048)
- MDRV_GFXDECODE(backfire)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(backfire)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_VIDEO_START(backfire)
- MDRV_VIDEO_UPDATE(backfire)
+ MCFG_VIDEO_START(backfire)
+ MCFG_VIDEO_UPDATE(backfire)
- MDRV_DECO16IC_ADD("deco_custom", backfire_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", backfire_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index e0609b0f962..3737ef2f54b 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -506,37 +506,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( badlands, badlands_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_int)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_int)
- MDRV_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_MACHINE_START(badlands)
- MDRV_MACHINE_RESET(badlands)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(badlands)
+ MCFG_MACHINE_RESET(badlands)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(badlands)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(badlands)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(badlands)
- MDRV_VIDEO_UPDATE(badlands)
+ MCFG_VIDEO_START(badlands)
+ MCFG_VIDEO_UPDATE(badlands)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
MACHINE_CONFIG_END
@@ -715,37 +715,37 @@ static MACHINE_RESET( badlandsb )
static MACHINE_CONFIG_START( badlandsb, badlands_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 2800000/2)
- MDRV_CPU_PROGRAM_MAP(bootleg_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_int)
+ MCFG_CPU_ADD("maincpu", M68000, 2800000/2)
+ MCFG_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_int)
-// MDRV_CPU_ADD("audiocpu", Z80, 2800000/8)
-// MDRV_CPU_PROGRAM_MAP(bootleg_soundmap)
+// MCFG_CPU_ADD("audiocpu", Z80, 2800000/8)
+// MCFG_CPU_PROGRAM_MAP(bootleg_soundmap)
- MDRV_MACHINE_START(badlands)
- MDRV_MACHINE_RESET(badlandsb)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(badlands)
+ MCFG_MACHINE_RESET(badlandsb)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(badlandsb)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(badlandsb)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(badlands)
- MDRV_VIDEO_UPDATE(badlands)
+ MCFG_VIDEO_START(badlands)
+ MCFG_VIDEO_UPDATE(badlands)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 2800000/4)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 2800000/4)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 31d3edba4b7..8c3617ca6b9 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -471,71 +471,71 @@ static const tms5110_interface bagman_tms5110_interface =
static MACHINE_CONFIG_START( bagman, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, BAGMAN_H0)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_MACHINE_RESET(bagman)
+ MCFG_MACHINE_RESET(bagman)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_GFXDECODE(bagman)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_GFXDECODE(bagman)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(bagman)
- MDRV_VIDEO_START(bagman)
- MDRV_VIDEO_UPDATE(bagman)
+ MCFG_PALETTE_INIT(bagman)
+ MCFG_VIDEO_START(bagman)
+ MCFG_VIDEO_UPDATE(bagman)
- MDRV_DEVICE_ADD("tmsprom", TMSPROM, 640000 / 2) /* rom clock */
- MDRV_DEVICE_CONFIG(prom_intf)
+ MCFG_DEVICE_ADD("tmsprom", TMSPROM, 640000 / 2) /* rom clock */
+ MCFG_DEVICE_CONFIG(prom_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, BAGMAN_H0 / 2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, BAGMAN_H0 / 2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("tms", TMS5110A, 640000)
- MDRV_SOUND_CONFIG(bagman_tms5110_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5110A, 640000)
+ MCFG_SOUND_CONFIG(bagman_tms5110_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pickin, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, BAGMAN_H0)
- MDRV_CPU_PROGRAM_MAP(pickin_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
+ MCFG_CPU_PROGRAM_MAP(pickin_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(bagman)
+ MCFG_MACHINE_RESET(bagman)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(pickin)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_GFXDECODE(pickin)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(bagman)
- MDRV_VIDEO_START(bagman)
- MDRV_VIDEO_UPDATE(bagman)
+ MCFG_PALETTE_INIT(bagman)
+ MCFG_VIDEO_START(bagman)
+ MCFG_VIDEO_UPDATE(bagman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
/* maybe */
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
/*
@@ -559,41 +559,41 @@ z80
static MACHINE_CONFIG_START( botanic, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, BAGMAN_H0)
- MDRV_CPU_PROGRAM_MAP(pickin_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
+ MCFG_CPU_PROGRAM_MAP(pickin_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(bagman)
+ MCFG_MACHINE_RESET(bagman)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_GFXDECODE(bagman)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(bagman)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(bagman)
- MDRV_VIDEO_START(bagman)
- MDRV_VIDEO_UPDATE(bagman)
+ MCFG_PALETTE_INIT(bagman)
+ MCFG_VIDEO_START(bagman)
+ MCFG_VIDEO_UPDATE(bagman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( squaitsa, botanic )
- MDRV_SOUND_MODIFY("aysnd")
- MDRV_SOUND_CONFIG(ay8910_dial_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_MODIFY("aysnd")
+ MCFG_SOUND_CONFIG(ay8910_dial_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 4946f8009ae..4b7e1028478 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -1193,62 +1193,62 @@ static const cem3394_interface cem_interface =
static MACHINE_CONFIG_START( balsente, balsente_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 5000000/4)
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", balsente_update_analog_inputs)
+ MCFG_CPU_ADD("maincpu", M6809, 5000000/4)
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", balsente_update_analog_inputs)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_IO_MAP(cpu2_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_IO_MAP(cpu2_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(balsente)
- MDRV_MACHINE_RESET(balsente)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(balsente)
+ MCFG_MACHINE_RESET(balsente)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_TIMER_ADD("scan_timer", balsente_interrupt_timer)
- MDRV_TIMER_ADD("8253_0_timer", balsente_clock_counter_0_ff)
- MDRV_TIMER_ADD("8253_1_timer", balsente_counter_callback)
- MDRV_TIMER_ADD("8253_2_timer", balsente_counter_callback)
+ MCFG_TIMER_ADD("scan_timer", balsente_interrupt_timer)
+ MCFG_TIMER_ADD("8253_0_timer", balsente_clock_counter_0_ff)
+ MCFG_TIMER_ADD("8253_1_timer", balsente_counter_callback)
+ MCFG_TIMER_ADD("8253_2_timer", balsente_counter_callback)
/* 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_RAW_PARAMS(BALSENTE_PIXEL_CLOCK, BALSENTE_HTOTAL, BALSENTE_HBEND, BALSENTE_HBSTART, BALSENTE_VTOTAL, BALSENTE_VBEND, BALSENTE_VBSTART)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(BALSENTE_PIXEL_CLOCK, BALSENTE_HTOTAL, BALSENTE_HBEND, BALSENTE_HBSTART, BALSENTE_VTOTAL, BALSENTE_VBEND, BALSENTE_VBSTART)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(balsente)
- MDRV_VIDEO_UPDATE(balsente)
+ MCFG_VIDEO_START(balsente)
+ MCFG_VIDEO_UPDATE(balsente)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("cem1", CEM3394, 0)
- MDRV_SOUND_CONFIG(cem_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("cem1", CEM3394, 0)
+ MCFG_SOUND_CONFIG(cem_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("cem2", CEM3394, 0)
- MDRV_SOUND_CONFIG(cem_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("cem2", CEM3394, 0)
+ MCFG_SOUND_CONFIG(cem_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("cem3", CEM3394, 0)
- MDRV_SOUND_CONFIG(cem_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("cem3", CEM3394, 0)
+ MCFG_SOUND_CONFIG(cem_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("cem4", CEM3394, 0)
- MDRV_SOUND_CONFIG(cem_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("cem4", CEM3394, 0)
+ MCFG_SOUND_CONFIG(cem_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("cem5", CEM3394, 0)
- MDRV_SOUND_CONFIG(cem_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("cem5", CEM3394, 0)
+ MCFG_SOUND_CONFIG(cem_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("cem6", CEM3394, 0)
- MDRV_SOUND_CONFIG(cem_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("cem6", CEM3394, 0)
+ MCFG_SOUND_CONFIG(cem_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -1256,10 +1256,10 @@ static MACHINE_CONFIG_DERIVED( shrike, balsente )
/* basic machine hardware */
- MDRV_CPU_ADD("68k", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(shrike68k_map)
+ MCFG_CPU_ADD("68k", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(shrike68k_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index ce2ba6a5b84..a2f5929be76 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -270,38 +270,38 @@ static MACHINE_RESET( bankp )
static MACHINE_CONFIG_START( bankp, bankp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, BANKP_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(bankp_map)
- MDRV_CPU_IO_MAP(bankp_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, BANKP_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(bankp_map)
+ MCFG_CPU_IO_MAP(bankp_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_RESET(bankp)
+ MCFG_MACHINE_RESET(bankp)
/* 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(3*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(bankp)
- MDRV_PALETTE_LENGTH(32*4+16*8)
-
- MDRV_PALETTE_INIT(bankp)
- MDRV_VIDEO_START(bankp)
- MDRV_VIDEO_UPDATE(bankp)
+ 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(3*8, 31*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(bankp)
+ MCFG_PALETTE_LENGTH(32*4+16*8)
+
+ MCFG_PALETTE_INIT(bankp)
+ MCFG_VIDEO_START(bankp)
+ MCFG_VIDEO_UPDATE(bankp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, BANKP_SN76496_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76489, BANKP_SN76496_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76489, BANKP_SN76496_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76489, BANKP_SN76496_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn3", SN76489, BANKP_SN76496_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn3", SN76489, BANKP_SN76496_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 870bc084832..801b9852c61 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -378,38 +378,38 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( baraduke, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(baraduke_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", M6809,49152000/32)
+ MCFG_CPU_PROGRAM_MAP(baraduke_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("mcu", HD63701,49152000/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
- MDRV_CPU_IO_MAP(mcu_port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63701,49152000/8)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_IO_MAP(mcu_port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- 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, 36*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(baraduke)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_PALETTE_INIT(baraduke)
- MDRV_VIDEO_START(baraduke)
- MDRV_VIDEO_UPDATE(baraduke)
- MDRV_VIDEO_EOF(baraduke)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ 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, 36*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(baraduke)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_PALETTE_INIT(baraduke)
+ MCFG_VIDEO_START(baraduke)
+ MCFG_VIDEO_UPDATE(baraduke)
+ MCFG_VIDEO_EOF(baraduke)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bartop52.c b/src/mame/drivers/bartop52.c
index 70b831aaa33..d4827ca552e 100644
--- a/src/mame/drivers/bartop52.c
+++ b/src/mame/drivers/bartop52.c
@@ -109,30 +109,30 @@ static const pokey_interface atari_pokey_interface =
static MACHINE_CONFIG_START( a5200, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
- MDRV_CPU_PROGRAM_MAP(a5200_mem)
- MDRV_CPU_VBLANK_INT_HACK(a5200_interrupt, TOTAL_LINES_60HZ)
+ MCFG_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
+ MCFG_CPU_PROGRAM_MAP(a5200_mem)
+ MCFG_CPU_VBLANK_INT_HACK(a5200_interrupt, TOTAL_LINES_60HZ)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(atari)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(atari)
- MDRV_VIDEO_START(atari)
- MDRV_VIDEO_UPDATE(atari)
+ MCFG_VIDEO_START(atari)
+ MCFG_VIDEO_UPDATE(atari)
- MDRV_SCREEN_MODIFY( "screen" )
- MDRV_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MDRV_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_MODIFY( "screen" )
+ MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
+ MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT)
- MDRV_SOUND_CONFIG(atari_pokey_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT)
+ MCFG_SOUND_CONFIG(atari_pokey_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index ee330319371..61a68c10486 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -235,29 +235,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( batman, batman_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(batman)
- MDRV_MACHINE_RESET(batman)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(batman)
+ MCFG_MACHINE_RESET(batman)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(batman)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(batman)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a VAD chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(batman)
- MDRV_VIDEO_UPDATE(batman)
+ MCFG_VIDEO_START(batman)
+ MCFG_VIDEO_UPDATE(batman)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_iii_mono)
+ MCFG_FRAGMENT_ADD(jsa_iii_mono)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index 10e9d2f7a89..6e7b1336c2e 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -296,37 +296,37 @@ static MACHINE_RESET( battlane )
static MACHINE_CONFIG_START( battlane, battlane_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 1250000) /* 1.25 MHz ? */
- MDRV_CPU_PROGRAM_MAP(battlane_map)
- MDRV_CPU_VBLANK_INT("screen", battlane_cpu1_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, 1250000) /* 1.25 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(battlane_map)
+ MCFG_CPU_VBLANK_INT("screen", battlane_cpu1_interrupt)
- MDRV_CPU_ADD("sub", M6809, 1250000) /* 1.25 MHz ? */
- MDRV_CPU_PROGRAM_MAP(battlane_map)
+ MCFG_CPU_ADD("sub", M6809, 1250000) /* 1.25 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(battlane_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(battlane)
- MDRV_MACHINE_RESET(battlane)
+ MCFG_MACHINE_START(battlane)
+ MCFG_MACHINE_RESET(battlane)
/* 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(1 * 8, 31 * 8 - 1, 0 * 8, 32 * 8 - 1)
- MDRV_GFXDECODE(battlane)
- MDRV_PALETTE_LENGTH(64)
-
- MDRV_VIDEO_START(battlane)
- MDRV_VIDEO_UPDATE(battlane)
+ 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(1 * 8, 31 * 8 - 1, 0 * 8, 32 * 8 - 1)
+ MCFG_GFXDECODE(battlane)
+ MCFG_PALETTE_LENGTH(64)
+
+ MCFG_VIDEO_START(battlane)
+ MCFG_VIDEO_UPDATE(battlane)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 9fe0983e9da..620f484e1da 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -232,43 +232,43 @@ static const c6280_interface c6280_config =
static MACHINE_CONFIG_START( battlera, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H6280,21477200/3)
- MDRV_CPU_PROGRAM_MAP(battlera_map)
- MDRV_CPU_IO_MAP(battlera_portmap)
- MDRV_CPU_VBLANK_INT_HACK(battlera_interrupt,256) /* 8 prelines, 232 lines, 16 vblank? */
+ MCFG_CPU_ADD("maincpu", H6280,21477200/3)
+ MCFG_CPU_PROGRAM_MAP(battlera_map)
+ MCFG_CPU_IO_MAP(battlera_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(battlera_interrupt,256) /* 8 prelines, 232 lines, 16 vblank? */
- MDRV_CPU_ADD("audiocpu", H6280,21477200/3)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,21477200/3)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* 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(0*8, 32*8-1, 1*8, 30*8-1)
- MDRV_GFXDECODE(battlera)
- MDRV_PALETTE_LENGTH(512)
-
- MDRV_VIDEO_START(battlera)
- MDRV_VIDEO_UPDATE(battlera)
+ 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(0*8, 32*8-1, 1*8, 30*8-1)
+ MCFG_GFXDECODE(battlera)
+ MCFG_PALETTE_LENGTH(512)
+
+ MCFG_VIDEO_START(battlera)
+ MCFG_VIDEO_UPDATE(battlera)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2203, 12000000 / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 12000000 / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85)
- MDRV_SOUND_ADD("c6280", C6280, 21477270/6)
- MDRV_SOUND_CONFIG(c6280_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("c6280", C6280, 21477270/6)
+ MCFG_SOUND_CONFIG(c6280_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index 9e23f48cf3f..03b52738eff 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -213,31 +213,31 @@ static MACHINE_RESET( battlex )
static MACHINE_CONFIG_START( battlex, battlex_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,10000000/2 ) /* 10 MHz, divided ? (Z80A CPU) */
- MDRV_CPU_PROGRAM_MAP(battlex_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) /* controls game speed? */
+ MCFG_CPU_ADD("maincpu", Z80,10000000/2 ) /* 10 MHz, divided ? (Z80A CPU) */
+ MCFG_CPU_PROGRAM_MAP(battlex_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8) /* controls game speed? */
- MDRV_MACHINE_RESET(battlex)
+ MCFG_MACHINE_RESET(battlex)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56) /* The video syncs at 15.8k H and 56 V (www.klov.com) */
- 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(battlex)
- MDRV_PALETTE_LENGTH(16*8+64)
-
- MDRV_PALETTE_INIT(battlex)
- MDRV_VIDEO_START(battlex)
- MDRV_VIDEO_UPDATE(battlex)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56) /* The video syncs at 15.8k H and 56 V (www.klov.com) */
+ 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(battlex)
+ MCFG_PALETTE_LENGTH(16*8+64)
+
+ MCFG_PALETTE_INIT(battlex)
+ MCFG_VIDEO_START(battlex)
+ MCFG_VIDEO_UPDATE(battlex)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 10000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 10000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 7243e7f861e..26717741fa6 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -245,39 +245,39 @@ static MACHINE_RESET( battlnts )
static MACHINE_CONFIG_START( battlnts, battlnts_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, XTAL_24MHz / 2 /* 3000000*4? */)
- MDRV_CPU_PROGRAM_MAP(battlnts_map)
- MDRV_CPU_VBLANK_INT("screen", battlnts_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz / 2 /* 3000000*4? */)
+ MCFG_CPU_PROGRAM_MAP(battlnts_map)
+ MCFG_CPU_VBLANK_INT("screen", battlnts_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz / 6 /* 3579545? */)
- MDRV_CPU_PROGRAM_MAP(battlnts_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz / 6 /* 3579545? */)
+ MCFG_CPU_PROGRAM_MAP(battlnts_sound_map)
- MDRV_MACHINE_START(battlnts)
- MDRV_MACHINE_RESET(battlnts)
+ MCFG_MACHINE_START(battlnts)
+ MCFG_MACHINE_RESET(battlnts)
/* 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(battlnts)
- MDRV_PALETTE_LENGTH(128)
+ 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(battlnts)
+ MCFG_PALETTE_LENGTH(128)
- MDRV_VIDEO_UPDATE(battlnts)
+ MCFG_VIDEO_UPDATE(battlnts)
- MDRV_K007342_ADD("k007342", bladestl_k007342_intf)
- MDRV_K007420_ADD("k007420", bladestl_k007420_intf)
+ MCFG_K007342_ADD("k007342", bladestl_k007342_intf)
+ MCFG_K007420_ADD("k007420", bladestl_k007420_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM3812, XTAL_24MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym1", YM3812, XTAL_24MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_24MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_24MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 61793f557d5..80f9564abdd 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -681,77 +681,77 @@ static VIDEO_EOF( mechatt )
static MACHINE_CONFIG_START( bbusters, bbusters_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(bbusters_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(bbusters_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_NVRAM_ADD_0FILL("eeprom")
+ MCFG_NVRAM_ADD_0FILL("eeprom")
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(bbusters)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(bbusters)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(bbuster)
- MDRV_VIDEO_UPDATE(bbuster)
- MDRV_VIDEO_EOF(bbuster)
+ MCFG_VIDEO_START(bbuster)
+ MCFG_VIDEO_UPDATE(bbuster)
+ MCFG_VIDEO_EOF(bbuster)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.0)
- 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", 1.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mechatt, bbusters_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(mechatt_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(mechatt_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sounda_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sounda_portmap)
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mechatt)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(mechatt)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(mechatt)
- MDRV_VIDEO_UPDATE(mechatt)
- MDRV_VIDEO_EOF(mechatt)
+ MCFG_VIDEO_START(mechatt)
+ MCFG_VIDEO_UPDATE(mechatt)
+ MCFG_VIDEO_EOF(mechatt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2608, 8000000)
- MDRV_SOUND_CONFIG(ym2608_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2608, 8000000)
+ MCFG_SOUND_CONFIG(ym2608_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c
index 6594ec1ea37..bf026aaccdf 100644
--- a/src/mame/drivers/beaminv.c
+++ b/src/mame/drivers/beaminv.c
@@ -330,21 +330,21 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( beaminv, beaminv_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
- MDRV_MACHINE_START(beaminv)
- MDRV_MACHINE_RESET(beaminv)
+ MCFG_MACHINE_START(beaminv)
+ MCFG_MACHINE_RESET(beaminv)
/* video hardware */
- MDRV_VIDEO_UPDATE(beaminv)
+ MCFG_VIDEO_UPDATE(beaminv)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 247, 16, 231)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 247, 16, 231)
+ MCFG_SCREEN_REFRESH_RATE(60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 75f65f127af..07bc6c23e63 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -401,25 +401,25 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( beathead, beathead_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ASAP, ATARI_CLOCK_14MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", ASAP, ATARI_CLOCK_14MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_TIMER_ADD("scan_timer", scanline_callback)
+ MCFG_TIMER_ADD("scan_timer", scanline_callback)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(42*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(42*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 0*8, 30*8-1)
+ MCFG_PALETTE_LENGTH(32768)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_iii_mono)
+ MCFG_FRAGMENT_ADD(jsa_iii_mono)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index 320001fd9a2..73b4a77a7b7 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -75,33 +75,33 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( beezer, beezer_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 1000000) /* 1 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(beezer_interrupt,128)
+ MCFG_CPU_ADD("maincpu", M6809, 1000000) /* 1 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(beezer_interrupt,128)
- MDRV_CPU_ADD("audiocpu", M6809, 1000000) /* 1 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, 1000000) /* 1 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* 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(256, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 303)
- MDRV_PALETTE_LENGTH(16)
+ 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(256, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 303)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_UPDATE(beezer)
+ MCFG_VIDEO_UPDATE(beezer)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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)
/* via */
- MDRV_VIA6522_ADD("via6522_0", 0, b_via_0_interface)
- MDRV_VIA6522_ADD("via6522_1", 0, b_via_1_interface)
+ MCFG_VIA6522_ADD("via6522_0", 0, b_via_0_interface)
+ MCFG_VIA6522_ADD("via6522_1", 0, b_via_1_interface)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index b3df6135966..33ec86e1b38 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -1047,41 +1047,41 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( berzerk, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(berzerk_map)
- MDRV_CPU_IO_MAP(berzerk_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(berzerk_map)
+ MCFG_CPU_IO_MAP(berzerk_io_map)
- MDRV_MACHINE_START(berzerk)
- MDRV_MACHINE_RESET(berzerk)
+ MCFG_MACHINE_START(berzerk)
+ MCFG_MACHINE_RESET(berzerk)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_START(berzerk)
- MDRV_VIDEO_UPDATE(berzerk)
+ MCFG_VIDEO_START(berzerk)
+ MCFG_VIDEO_UPDATE(berzerk)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_RESET(berzerk)
+ MCFG_SOUND_RESET(berzerk)
- MDRV_SOUND_ADD("speech", S14001A, 0) /* placeholder - the clock is software controllable */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("speech", S14001A, 0) /* placeholder - the clock is software controllable */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("exidy", EXIDY, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("exidy", EXIDY, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( frenzy, berzerk )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(frenzy_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(frenzy_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index 91d82e3b744..53e317fd297 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -329,33 +329,33 @@ static GFXDECODE_START( bestleag )
GFXDECODE_END
static MACHINE_CONFIG_START( bestleag, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(bestleag_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(bestleag_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- 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)
+ 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)
- MDRV_GFXDECODE(bestleag)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(bestleag)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(bestleag)
- MDRV_VIDEO_UPDATE(bestleag)
+ MCFG_VIDEO_START(bestleag)
+ MCFG_VIDEO_UPDATE(bestleag)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) /* Hand-tuned */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) /* Hand-tuned */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bestleaw, bestleag )
- MDRV_VIDEO_UPDATE(bestleaw)
+ MCFG_VIDEO_UPDATE(bestleaw)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index a823f731fa7..d743b8964c1 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1731,43 +1731,43 @@ static INTERRUPT_GEN( vblank_gen )
}
static MACHINE_CONFIG_START( bfcobra, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, Z80_XTAL)
- MDRV_CPU_PROGRAM_MAP(z80_prog_map)
- MDRV_CPU_IO_MAP(z80_io_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_gen)
+ MCFG_CPU_ADD("maincpu", Z80, Z80_XTAL)
+ MCFG_CPU_PROGRAM_MAP(z80_prog_map)
+ MCFG_CPU_IO_MAP(z80_io_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_gen)
- MDRV_CPU_ADD("audiocpu", M6809, M6809_XTAL)
- MDRV_CPU_PROGRAM_MAP(m6809_prog_map)
- MDRV_CPU_PERIODIC_INT(timer_irq, 1000)
+ MCFG_CPU_ADD("audiocpu", M6809, M6809_XTAL)
+ MCFG_CPU_PROGRAM_MAP(m6809_prog_map)
+ MCFG_CPU_PERIODIC_INT(timer_irq, 1000)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_RESET(bfcobra)
+ MCFG_MACHINE_RESET(bfcobra)
/* TODO */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512 - 1, 0, 256 - 1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512 - 1, 0, 256 - 1)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, M6809_XTAL)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, M6809_XTAL)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_VIDEO_START(bfcobra)
- MDRV_VIDEO_UPDATE(bfcobra)
+ MCFG_VIDEO_START(bfcobra)
+ MCFG_VIDEO_UPDATE(bfcobra)
/* ACIAs */
- MDRV_ACIA6850_ADD("acia6850_0", z80_acia_if)
- MDRV_ACIA6850_ADD("acia6850_1", m6809_acia_if)
- MDRV_ACIA6850_ADD("acia6850_2", data_acia_if)
+ MCFG_ACIA6850_ADD("acia6850_0", z80_acia_if)
+ MCFG_ACIA6850_ADD("acia6850_1", m6809_acia_if)
+ MCFG_ACIA6850_ADD("acia6850_2", data_acia_if)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index 91a1100aca2..29c1688795b 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -1242,17 +1242,17 @@ INPUT_PORTS_END
/////////////////////////////////////////////////////////////////////////////////////
static MACHINE_CONFIG_START( scorpion1, driver_device )
- MDRV_MACHINE_RESET(bfm_sc1) // main scorpion1 board initialisation
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
- MDRV_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap
- MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second
+ MCFG_MACHINE_RESET(bfm_sc1) // main scorpion1 board initialisation
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
+ MCFG_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap
+ MCFG_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd",AY8912, MASTER_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd",AY8912, MASTER_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_DEFAULT_LAYOUT(layout_awpvid14)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_DEFAULT_LAYOUT(layout_awpvid14)
MACHINE_CONFIG_END
/////////////////////////////////////////////////////////////////////////////////////
@@ -1261,28 +1261,28 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( scorpion1_adder2, scorpion1 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(memmap_adder2) // setup read and write memorymap
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(memmap_adder2) // setup read and write memorymap
- MDRV_DEFAULT_LAYOUT(layout_bfm_sc1)
- MDRV_SCREEN_ADD("adder", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_SIZE( 400, 300)
- MDRV_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 300-1)
+ MCFG_DEFAULT_LAYOUT(layout_bfm_sc1)
+ MCFG_SCREEN_ADD("adder", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_SIZE( 400, 300)
+ MCFG_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 300-1)
- MDRV_VIDEO_START( adder2)
- MDRV_VIDEO_RESET( adder2)
- MDRV_VIDEO_UPDATE(adder2)
+ MCFG_VIDEO_START( adder2)
+ MCFG_VIDEO_RESET( adder2)
+ MCFG_VIDEO_UPDATE(adder2)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(adder2)
- MDRV_GFXDECODE(adder2)
+ MCFG_PALETTE_INIT(adder2)
+ MCFG_GFXDECODE(adder2)
- MDRV_CPU_ADD("adder2", M6809, ADDER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz
- MDRV_CPU_PROGRAM_MAP(adder2_memmap) // setup adder2 board memorymap
- MDRV_CPU_VBLANK_INT("adder",adder2_vbl) // board has a VBL IRQ
+ MCFG_CPU_ADD("adder2", M6809, ADDER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz
+ MCFG_CPU_PROGRAM_MAP(adder2_memmap) // setup adder2 board memorymap
+ MCFG_CPU_VBLANK_INT("adder",adder2_vbl) // board has a VBL IRQ
MACHINE_CONFIG_END
/////////////////////////////////////////////////////////////////////////////////////
@@ -1290,11 +1290,11 @@ MACHINE_CONFIG_END
/////////////////////////////////////////////////////////////////////////////////////
static MACHINE_CONFIG_DERIVED( scorpion1_nec_uk, scorpion1 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sc1_nec_uk) // setup read and write memorymap
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sc1_nec_uk) // setup read and write memorymap
- MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
// ROM definition ///////////////////////////////////////////////////////////////////
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index d5b11de7537..1189bc733fd 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -2215,40 +2215,40 @@ INPUT_PORTS_END
///////////////////////////////////////////////////////////////////////////
static MACHINE_CONFIG_START( scorpion2_vid, driver_device )
- MDRV_MACHINE_RESET( init ) // main scorpion2 board initialisation
- MDRV_QUANTUM_TIME(HZ(960)) // needed for serial communication !!
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz
- MDRV_CPU_PROGRAM_MAP(memmap_vid) // setup scorpion2 board memorymap
- MDRV_CPU_PERIODIC_INT(timer_irq, 1000) // generate 1000 IRQ's per second
-
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_NVRAM_HANDLER(bfm_sc2)
- MDRV_DEFAULT_LAYOUT(layout_bfm_sc2)
-
- MDRV_SCREEN_ADD("adder", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE( 400, 280)
- MDRV_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 280-1)
- MDRV_SCREEN_REFRESH_RATE(50)
-
- MDRV_VIDEO_START( adder2)
- MDRV_VIDEO_RESET( adder2)
- MDRV_VIDEO_UPDATE(addersc2)
-
- MDRV_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(adder2)
- MDRV_GFXDECODE(adder2)
-
- MDRV_CPU_ADD("adder2", M6809, MASTER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz
- MDRV_CPU_PROGRAM_MAP(adder2_memmap) // setup adder2 board memorymap
- MDRV_CPU_VBLANK_INT("adder", adder2_vbl) // board has a VBL IRQ
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_MACHINE_RESET( init ) // main scorpion2 board initialisation
+ MCFG_QUANTUM_TIME(HZ(960)) // needed for serial communication !!
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz
+ MCFG_CPU_PROGRAM_MAP(memmap_vid) // setup scorpion2 board memorymap
+ MCFG_CPU_PERIODIC_INT(timer_irq, 1000) // generate 1000 IRQ's per second
+
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_HANDLER(bfm_sc2)
+ MCFG_DEFAULT_LAYOUT(layout_bfm_sc2)
+
+ MCFG_SCREEN_ADD("adder", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE( 400, 280)
+ MCFG_SCREEN_VISIBLE_AREA( 0, 400-1, 0, 280-1)
+ MCFG_SCREEN_REFRESH_RATE(50)
+
+ MCFG_VIDEO_START( adder2)
+ MCFG_VIDEO_RESET( adder2)
+ MCFG_VIDEO_UPDATE(addersc2)
+
+ MCFG_PALETTE_LENGTH(16)
+ MCFG_PALETTE_INIT(adder2)
+ MCFG_GFXDECODE(adder2)
+
+ MCFG_CPU_ADD("adder2", M6809, MASTER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz
+ MCFG_CPU_PROGRAM_MAP(adder2_memmap) // setup adder2 board memorymap
+ MCFG_CPU_VBLANK_INT("adder", adder2_vbl) // board has a VBL IRQ
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static void sc2_common_init(running_machine *machine, int decrypt)
@@ -3967,56 +3967,56 @@ INPUT_PORTS_END
/* machine driver for scorpion2 board */
static MACHINE_CONFIG_START( scorpion2, driver_device )
- MDRV_MACHINE_RESET(awp_init)
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
- MDRV_CPU_PROGRAM_MAP(sc2_memmap)
- MDRV_CPU_PERIODIC_INT(timer_irq, 1000 )
+ MCFG_MACHINE_RESET(awp_init)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
+ MCFG_CPU_PROGRAM_MAP(sc2_memmap)
+ MCFG_CPU_PERIODIC_INT(timer_irq, 1000 )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_NVRAM_HANDLER(bfm_sc2)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_HANDLER(bfm_sc2)
/* video hardware */
- MDRV_DEFAULT_LAYOUT(layout_awpvid14)
+ MCFG_DEFAULT_LAYOUT(layout_awpvid14)
MACHINE_CONFIG_END
/* machine driver for scorpion3 board */
static MACHINE_CONFIG_DERIVED( scorpion3, scorpion2 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sc3_memmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sc3_memmap)
MACHINE_CONFIG_END
/* machine driver for scorpion2 board + matrix board */
static MACHINE_CONFIG_START( scorpion2_dm01, driver_device )
- MDRV_MACHINE_RESET(dm01_init)
- MDRV_QUANTUM_TIME(HZ(960)) // needed for serial communication !!
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
- MDRV_CPU_PROGRAM_MAP(memmap_sc2_dm01)
- MDRV_CPU_PERIODIC_INT(timer_irq, 1000 )
+ MCFG_MACHINE_RESET(dm01_init)
+ MCFG_QUANTUM_TIME(HZ(960)) // needed for serial communication !!
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
+ MCFG_CPU_PROGRAM_MAP(memmap_sc2_dm01)
+ MCFG_CPU_PERIODIC_INT(timer_irq, 1000 )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_NVRAM_HANDLER(bfm_sc2)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_HANDLER(bfm_sc2)
/* video hardware */
- MDRV_DEFAULT_LAYOUT(layout_awpdmd)
- MDRV_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/
- MDRV_CPU_PROGRAM_MAP(bfm_dm01_memmap)
- MDRV_CPU_PERIODIC_INT(bfm_dm01_vbl, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */
+ MCFG_DEFAULT_LAYOUT(layout_awpdmd)
+ MCFG_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/
+ MCFG_CPU_PROGRAM_MAP(bfm_dm01_memmap)
+ MCFG_CPU_PERIODIC_INT(bfm_dm01_vbl, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */
MACHINE_CONFIG_END
static void sc2awp_common_init(running_machine *machine,int reels, int decrypt)
diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c
index 1ddd9da5e41..2562763faac 100644
--- a/src/mame/drivers/bfmsys85.c
+++ b/src/mame/drivers/bfmsys85.c
@@ -435,21 +435,21 @@ ADDRESS_MAP_END
// machine driver for system85 board //////////////////////////////////////
static MACHINE_CONFIG_START( bfmsys85, driver_device )
- MDRV_MACHINE_START(bfm_sys85) // main system85 board initialisation
- MDRV_MACHINE_RESET(bfm_sys85)
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
- MDRV_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap
- MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second
+ MCFG_MACHINE_START(bfm_sys85) // main system85 board initialisation
+ MCFG_MACHINE_RESET(bfm_sys85)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
+ MCFG_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap
+ MCFG_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second
- MDRV_ACIA6850_ADD("acia6850_0", m6809_acia_if)
+ MCFG_ACIA6850_ADD("acia6850_0", m6809_acia_if)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd",AY8912, MASTER_CLOCK/4) // add AY8912 soundchip
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd",AY8912, MASTER_CLOCK/4) // add AY8912 soundchip
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_NVRAM_ADD_0FILL("nvram") // load/save nv RAM
+ MCFG_NVRAM_ADD_0FILL("nvram") // load/save nv RAM
- MDRV_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_DEFAULT_LAYOUT(layout_awpvid16)
MACHINE_CONFIG_END
// input ports for system85 board /////////////////////////////////////////
diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c
index ee1ff967d5f..26b3e11368a 100644
--- a/src/mame/drivers/big10.c
+++ b/src/mame/drivers/big10.c
@@ -241,34 +241,34 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( big10, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* guess */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io)
- MDRV_CPU_VBLANK_INT_HACK(big10_interrupt, 262)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* guess */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io)
+ MCFG_CPU_VBLANK_INT_HACK(big10_interrupt, 262)
- MDRV_MACHINE_RESET(big10)
+ MCFG_MACHINE_RESET(big10)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512 + 32, (212 + 28) * 2)
- MDRV_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1)
+ MCFG_SCREEN_SIZE(512 + 32, (212 + 28) * 2)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1)
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(v9938)
- MDRV_VIDEO_START(big10)
- MDRV_VIDEO_UPDATE(generic_bitmapped)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(v9938)
+ MCFG_VIDEO_START(big10)
+ MCFG_VIDEO_UPDATE(generic_bitmapped)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12) /* guess */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12) /* guess */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index 82d1b58be04..90c72309f78 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -506,58 +506,58 @@ static MACHINE_RESET( bigevglf )
static MACHINE_CONFIG_START( bigevglf, bigevglf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(bigevglf_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* vblank */
-
- MDRV_CPU_ADD("sub", Z80,10000000/2) /* 5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_IO_MAP(bigevglf_sub_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* vblank */
-
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ???;
+ MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(bigevglf_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* vblank */
+
+ MCFG_CPU_ADD("sub", Z80,10000000/2) /* 5 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_IO_MAP(bigevglf_sub_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* vblank */
+
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ???;
2 irqs/frame give good music tempo but also SOUND ERROR in test mode,
4 irqs/frame give SOUND OK in test mode but music seems to be running too fast */
- MDRV_CPU_ADD("mcu", M68705,2000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(m68705_map)
+ MCFG_CPU_ADD("mcu", M68705,2000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(m68705_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - interleaving is forced on the fly */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - interleaving is forced on the fly */
- MDRV_MACHINE_START(bigevglf)
- MDRV_MACHINE_RESET(bigevglf)
+ MCFG_MACHINE_START(bigevglf)
+ MCFG_MACHINE_RESET(bigevglf)
/* 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(bigevglf)
- MDRV_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(bigevglf)
- MDRV_VIDEO_UPDATE(bigevglf)
+ 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(bigevglf)
+ MCFG_PALETTE_LENGTH(0x800)
+ MCFG_VIDEO_START(bigevglf)
+ MCFG_VIDEO_UPDATE(bigevglf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) /* YM2149 really */
-
- 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, 8000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) /* YM2149 really */
+
+ 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
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 1d36eecceb8..854f60c479a 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -680,46 +680,46 @@ static MACHINE_RESET( bigfghtr )
static MACHINE_CONFIG_START( bigfghtr, bigfghtr_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(mainmem)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(mainmem)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(soundmem)
- MDRV_CPU_IO_MAP(soundport)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(soundmem)
+ MCFG_CPU_IO_MAP(soundport)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(bigfghtr)
- MDRV_MACHINE_RESET(bigfghtr )
+ MCFG_MACHINE_START(bigfghtr)
+ MCFG_MACHINE_RESET(bigfghtr )
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- 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(12*8, (64-12)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(bigfghtr)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ 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(12*8, (64-12)*8-1, 1*8, 31*8-1 )
+ MCFG_GFXDECODE(bigfghtr)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(bigfghtr)
- MDRV_VIDEO_START(bigfghtr)
- MDRV_VIDEO_UPDATE(bigfghtr)
+ MCFG_VIDEO_EOF(bigfghtr)
+ MCFG_VIDEO_START(bigfghtr)
+ MCFG_VIDEO_UPDATE(bigfghtr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index dc97395d898..5296434e741 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -196,35 +196,35 @@ GFXDECODE_END
static MACHINE_CONFIG_START( bigstrkb, bigstrkb_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(bigstrkb_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(bigstrkb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_GFXDECODE(bigstrkb)
+ MCFG_GFXDECODE(bigstrkb)
- 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)
+ 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)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(bigstrkb)
- MDRV_VIDEO_UPDATE(bigstrkb)
+ MCFG_VIDEO_START(bigstrkb)
+ MCFG_VIDEO_UPDATE(bigstrkb)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-// MDRV_SOUND_ADD("ymsnd", YM2151, ym2151_config)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+// MCFG_SOUND_ADD("ymsnd", YM2151, ym2151_config)
- MDRV_OKIM6295_ADD("oki1", 4000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_OKIM6295_ADD("oki1", 4000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_OKIM6295_ADD("oki2", 4000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_OKIM6295_ADD("oki2", 4000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
/* Rom Loading */
diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c
index b2deecec3e9..7d4931b97e7 100644
--- a/src/mame/drivers/bingoc.c
+++ b/src/mame/drivers/bingoc.c
@@ -127,39 +127,39 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( bingoc, driver_device )
- MDRV_CPU_ADD("maincpu", M68000,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,8000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io)
+ MCFG_CPU_ADD("soundcpu", Z80,4000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io)
#if SOUND_TEST
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
#endif
/* 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-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-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(bingoc)
- MDRV_VIDEO_UPDATE(bingoc)
+ MCFG_VIDEO_START(bingoc)
+ MCFG_VIDEO_UPDATE(bingoc)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") //might just be mono...
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") //might just be mono...
- MDRV_SOUND_ADD("ymsnd", YM2151, 7159160/2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 7159160/2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
ROM_START( bingoc )
diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c
index 56d7c4d5864..50a07c82c37 100644
--- a/src/mame/drivers/bingor.c
+++ b/src/mame/drivers/bingor.c
@@ -603,35 +603,35 @@ GFXDECODE_END
static MACHINE_CONFIG_START( bingor, driver_device )
- MDRV_CPU_ADD("maincpu", I80186, 14000000 ) //?? Mhz
- MDRV_CPU_PROGRAM_MAP(bingor_map)
- MDRV_CPU_IO_MAP(bingor_io)
- MDRV_CPU_VBLANK_INT("screen", vblank_irq)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 30)
- MDRV_CPU_PERIODIC_INT(unk_irq, 30)
+ MCFG_CPU_ADD("maincpu", I80186, 14000000 ) //?? Mhz
+ MCFG_CPU_PROGRAM_MAP(bingor_map)
+ MCFG_CPU_IO_MAP(bingor_io)
+ MCFG_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 30)
+ MCFG_CPU_PERIODIC_INT(unk_irq, 30)
- MDRV_CPU_ADD("pic", PIC16C57, 12000000) //?? Mhz
- MDRV_CPU_IO_MAP(pic_io_map)
+ MCFG_CPU_ADD("pic", PIC16C57, 12000000) //?? Mhz
+ MCFG_CPU_IO_MAP(pic_io_map)
- MDRV_GFXDECODE(bingor)
- //MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_GFXDECODE(bingor)
+ //MCFG_NVRAM_ADD_0FILL("nvram")
- 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(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1)
+ 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(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(bingor)
- MDRV_VIDEO_UPDATE(bingor)
+ MCFG_VIDEO_START(bingor)
+ MCFG_VIDEO_UPDATE(bingor)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("saa", SAA1099, 6000000 )
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("saa", SAA1099, 6000000 )
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
// I doubt we need to load the eeproms
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index f1d44bc7024..33d5683eebd 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -359,42 +359,42 @@ static MACHINE_RESET( bionicc )
static MACHINE_CONFIG_START( bionicc, bionicc_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2) /* 12 MHz - verified in schematics */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(bionicc_interrupt,8)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2) /* 12 MHz - verified in schematics */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(bionicc_interrupt,8)
- MDRV_CPU_ADD("audiocpu", Z80, EXO3_F0_CLK / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, EXO3_F0_CLK / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* FIXME: interrupt timing
* schematics indicate that nmi_line is set on M680000 access with AB1=1
* and IOCS=0 (active low), see pages A-1/10, A-4/10 in schematics
*/
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4)
- MDRV_MACHINE_START(bionicc)
- MDRV_MACHINE_RESET(bionicc)
+ MCFG_MACHINE_START(bionicc)
+ MCFG_MACHINE_RESET(bionicc)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
-
- 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(bionicc)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(bionicc)
- MDRV_VIDEO_EOF(bionicc)
- MDRV_VIDEO_UPDATE(bionicc)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(bionicc)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_VIDEO_START(bionicc)
+ MCFG_VIDEO_EOF(bionicc)
+ MCFG_VIDEO_UPDATE(bionicc)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 212145226cc..65a3875a28b 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -421,39 +421,39 @@ static MACHINE_RESET( bishi )
static MACHINE_CONFIG_START( bishi, bishi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(bishi_interrupt, 2)
+ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(bishi_interrupt, 2)
- MDRV_MACHINE_START(bishi)
- MDRV_MACHINE_RESET(bishi)
+ MCFG_MACHINE_START(bishi)
+ MCFG_MACHINE_RESET(bishi)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1200))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(29, 29+288-1, 16, 16+224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1200))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(29, 29+288-1, 16, 16+224-1)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(bishi)
- MDRV_VIDEO_UPDATE(bishi)
+ MCFG_VIDEO_START(bishi)
+ MCFG_VIDEO_UPDATE(bishi)
- MDRV_K056832_ADD("k056832", bishi_k056832_intf)
- MDRV_K054338_ADD("k054338", bishi_k054338_intf)
- MDRV_K055555_ADD("k055555")
+ MCFG_K056832_ADD("k056832", bishi_k056832_intf)
+ MCFG_K054338_ADD("k054338", bishi_k054338_intf)
+ MCFG_K055555_ADD("k055555")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, SOUND_CLOCK) /* 16.9344MHz */
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, SOUND_CLOCK) /* 16.9344MHz */
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
// ROM definitions
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index 077b44db985..8b761577ae7 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -827,24 +827,24 @@ static INTERRUPT_GEN( bishjan_interrupt )
}
static MACHINE_CONFIG_START( bishjan, driver_device )
- MDRV_CPU_ADD("maincpu", H83044, XTAL_44_1MHz / 3)
- MDRV_CPU_PROGRAM_MAP( bishjan_map)
- MDRV_CPU_VBLANK_INT_HACK(bishjan_interrupt,2)
+ MCFG_CPU_ADD("maincpu", H83044, XTAL_44_1MHz / 3)
+ MCFG_CPU_PROGRAM_MAP( bishjan_map)
+ MCFG_CPU_VBLANK_INT_HACK(bishjan_interrupt,2)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE( 512, 256 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 )
- MDRV_SCREEN_REFRESH_RATE( 60 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE( 512, 256 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 )
+ MCFG_SCREEN_REFRESH_RATE( 60 )
- MDRV_GFXDECODE(bishjan)
- MDRV_PALETTE_LENGTH( 256 )
+ MCFG_GFXDECODE(bishjan)
+ MCFG_PALETTE_LENGTH( 256 )
- MDRV_VIDEO_START( bishjan )
- MDRV_VIDEO_UPDATE( bishjan )
+ MCFG_VIDEO_START( bishjan )
+ MCFG_VIDEO_UPDATE( bishjan )
MACHINE_CONFIG_END
/***************************************************************************
@@ -858,35 +858,35 @@ static INTERRUPT_GEN( saklove_interrupt )
}
static MACHINE_CONFIG_START( saklove, driver_device )
- MDRV_CPU_ADD("maincpu", I80188, XTAL_20MHz ) // !! AMD AM188-EM !!
- MDRV_CPU_PROGRAM_MAP( saklove_map)
- MDRV_CPU_IO_MAP( saklove_io)
- MDRV_CPU_VBLANK_INT( "screen", saklove_interrupt )
+ MCFG_CPU_ADD("maincpu", I80188, XTAL_20MHz ) // !! AMD AM188-EM !!
+ MCFG_CPU_PROGRAM_MAP( saklove_map)
+ MCFG_CPU_IO_MAP( saklove_io)
+ MCFG_CPU_VBLANK_INT( "screen", saklove_interrupt )
- MDRV_MACHINE_RESET(saklove)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(saklove)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE( 512, 256 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 )
- MDRV_SCREEN_REFRESH_RATE( 58.7270 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE( 512, 256 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 )
+ MCFG_SCREEN_REFRESH_RATE( 58.7270 )
- MDRV_GFXDECODE(bishjan)
- MDRV_PALETTE_LENGTH( 256 )
+ MCFG_GFXDECODE(bishjan)
+ MCFG_PALETTE_LENGTH( 256 )
- MDRV_VIDEO_START( bishjan )
- MDRV_VIDEO_UPDATE( bishjan )
+ MCFG_VIDEO_START( bishjan )
+ MCFG_VIDEO_UPDATE( bishjan )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz / 4) // ? chip and clock unknown
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz / 4) // ? chip and clock unknown
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 7d2ecfb580b..1a53e33a663 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -479,64 +479,64 @@ static MACHINE_RESET( bking3 )
static MACHINE_CONFIG_START( bking, bking_state )
/* basic machine hardware */
- MDRV_CPU_ADD("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(bking_map)
- MDRV_CPU_IO_MAP(bking_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(bking_map)
+ MCFG_CPU_IO_MAP(bking_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(bking_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(bking_audio_map)
/* interrupts (from Jungle King hardware, might be wrong): */
/* - no interrupts synced with vblank */
/* - NMI triggered by the main CPU */
/* - periodic IRQ, with frequency 6000000/(4*16*16*10*16) = 36.621 Hz, */
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16))
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16))
- MDRV_MACHINE_START(bking)
- MDRV_MACHINE_RESET(bking)
+ MCFG_MACHINE_START(bking)
+ MCFG_MACHINE_RESET(bking)
/* 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(bking)
- MDRV_PALETTE_LENGTH(4*8+4*4+4*2+4*2)
-
- MDRV_PALETTE_INIT(bking)
- MDRV_VIDEO_START(bking)
- MDRV_VIDEO_UPDATE(bking)
- MDRV_VIDEO_EOF(bking)
+ 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(bking)
+ MCFG_PALETTE_LENGTH(4*8+4*4+4*2+4*2)
+
+ MCFG_PALETTE_INIT(bking)
+ MCFG_VIDEO_START(bking)
+ MCFG_VIDEO_UPDATE(bking)
+ MCFG_VIDEO_EOF(bking)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bking3, bking )
- MDRV_CPU_MODIFY("main_cpu")
- MDRV_CPU_IO_MAP(bking3_io_map)
+ MCFG_CPU_MODIFY("main_cpu")
+ MCFG_CPU_IO_MAP(bking3_io_map)
- MDRV_CPU_ADD("mcu", M68705, XTAL_3MHz) /* xtal is 3MHz, divided by 4 internally */
- MDRV_CPU_PROGRAM_MAP(buggychl_mcu_map)
- MDRV_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
+ MCFG_CPU_ADD("mcu", M68705, XTAL_3MHz) /* xtal is 3MHz, divided by 4 internally */
+ MCFG_CPU_PROGRAM_MAP(buggychl_mcu_map)
+ MCFG_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
- MDRV_MACHINE_START(bking3)
- MDRV_MACHINE_RESET(bking3)
+ MCFG_MACHINE_START(bking3)
+ MCFG_MACHINE_RESET(bking3)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index cde9cb53f29..0c5d12377c1 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -472,37 +472,37 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_START( blackt96, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 18000000 /2)
- MDRV_CPU_PROGRAM_MAP(blackt96_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 18000000 /2)
+ MCFG_CPU_PROGRAM_MAP(blackt96_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", PIC16C57, 8000000) /* ? */
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", PIC16C57, 8000000) /* ? */
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_GFXDECODE(blackt96)
+ MCFG_GFXDECODE(blackt96)
- 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(256, 256)
-// MDRV_SCREEN_VISIBLE_AREA(0*8, 16*32-1, 0*8, 16*32-1)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 256-1, 0*8, 208-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(256, 256)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 16*32-1, 0*8, 16*32-1)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 256-1, 0*8, 208-1)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(blackt96)
- MDRV_VIDEO_UPDATE(blackt96)
+ MCFG_VIDEO_START(blackt96)
+ MCFG_VIDEO_UPDATE(blackt96)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", 8000000/8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki1", 8000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
- MDRV_OKIM6295_ADD("oki2", 8000000/8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki2", 8000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index b8228a62058..2aa4c6b5295 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -336,47 +336,47 @@ static MACHINE_RESET( bladestl )
static MACHINE_CONFIG_START( bladestl, bladestl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 24000000/2) /* 24MHz/2 (?) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(bladestl_interrupt,2) /* (1 IRQ + 1 NMI) */
+ MCFG_CPU_ADD("maincpu", HD6309, 24000000/2) /* 24MHz/2 (?) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(bladestl_interrupt,2) /* (1 IRQ + 1 NMI) */
- MDRV_CPU_ADD("audiocpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(bladestl)
- MDRV_MACHINE_RESET(bladestl)
+ MCFG_MACHINE_START(bladestl)
+ MCFG_MACHINE_RESET(bladestl)
/* 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)
+ 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)
- MDRV_GFXDECODE(bladestl)
- MDRV_PALETTE_INIT(bladestl)
- MDRV_PALETTE_LENGTH(32 + 16*16)
+ MCFG_GFXDECODE(bladestl)
+ MCFG_PALETTE_INIT(bladestl)
+ MCFG_PALETTE_LENGTH(32 + 16*16)
- MDRV_VIDEO_UPDATE(bladestl)
+ MCFG_VIDEO_UPDATE(bladestl)
- MDRV_K007342_ADD("k007342", bladestl_k007342_intf)
- MDRV_K007420_ADD("k007420", bladestl_k007420_intf)
- MDRV_K051733_ADD("k051733")
+ MCFG_K007342_ADD("k007342", bladestl_k007342_intf)
+ MCFG_K007420_ADD("k007420", bladestl_k007420_intf)
+ MCFG_K051733_ADD("k051733")
/* sound hardware */
/* the initialization order is important, the port callbacks being
called at initialization time */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("ymsnd", YM2203, 3579545)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3579545)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c
index 6c2c02f3d28..87cb1d76025 100644
--- a/src/mame/drivers/blitz.c
+++ b/src/mame/drivers/blitz.c
@@ -770,33 +770,33 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( megadpkr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(megadpkr_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(megadpkr_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
-// MDRV_CPU_ADD("mcu", M68705, CPU_CLOCK) /* unknown */
-// MDRV_CPU_PROGRAM_MAP(mcu_map)
+// MCFG_CPU_ADD("mcu", M68705, CPU_CLOCK) /* unknown */
+// MCFG_CPU_PROGRAM_MAP(mcu_map)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", megadpkr_pia0_intf)
- MDRV_PIA6821_ADD("pia1", megadpkr_pia1_intf)
+ MCFG_PIA6821_ADD("pia0", megadpkr_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", megadpkr_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((32)*8, (32)*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
-
- MDRV_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf)
-
- MDRV_GFXDECODE(megadpkr)
- MDRV_PALETTE_INIT(megadpkr)
- MDRV_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(megadpkr)
- MDRV_VIDEO_UPDATE(megadpkr)
+ 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, 0*8, 32*8-1)
+
+ MCFG_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf)
+
+ MCFG_GFXDECODE(megadpkr)
+ MCFG_PALETTE_INIT(megadpkr)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_VIDEO_START(megadpkr)
+ MCFG_VIDEO_UPDATE(megadpkr)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c
index 3dc4baa2b43..e0f4737df11 100644
--- a/src/mame/drivers/blitz68k.c
+++ b/src/mame/drivers/blitz68k.c
@@ -1665,26 +1665,26 @@ const mc6845_interface mc6845_intf_irq5 =
};
static MACHINE_CONFIG_START( ilpag, blitz68k_state )
- MDRV_CPU_ADD("maincpu", M68000, 11059200 ) // ?
- MDRV_CPU_PROGRAM_MAP(ilpag_map)
- MDRV_CPU_VBLANK_INT("screen",irq4_line_hold) //3 & 6 used, mcu comms?
-
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
- MDRV_NVRAM_ADD_0FILL("nvram")
-
- MDRV_PALETTE_LENGTH(0x100)
-
- MDRV_VIDEO_START(blitz68k)
- MDRV_VIDEO_UPDATE(blitz68k)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_CPU_ADD("maincpu", M68000, 11059200 ) // ?
+ MCFG_CPU_PROGRAM_MAP(ilpag_map)
+ MCFG_CPU_VBLANK_INT("screen",irq4_line_hold) //3 & 6 used, mcu comms?
+
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+
+ MCFG_PALETTE_LENGTH(0x100)
+
+ MCFG_VIDEO_START(blitz68k)
+ MCFG_VIDEO_UPDATE(blitz68k)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
/*
@@ -1733,190 +1733,190 @@ static INTERRUPT_GEN( steaser_irq )
}
static MACHINE_CONFIG_DERIVED( steaser, ilpag )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(steaser_map)
- MDRV_CPU_VBLANK_INT_HACK(steaser_irq,4)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(steaser_map)
+ MCFG_CPU_VBLANK_INT_HACK(steaser_irq,4)
- MDRV_TIMER_ADD_PERIODIC("coinsim", steaser_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
+ MCFG_TIMER_ADD_PERIODIC("coinsim", steaser_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cjffruit, blitz68k_state )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2)
- MDRV_CPU_PROGRAM_MAP(cjffruit_map)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2)
+ MCFG_CPU_PROGRAM_MAP(cjffruit_map)
// MC68HC705C8P (Sound MCU)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-8-1)
- MDRV_MC6845_ADD("crtc", R6545_1, XTAL_22_1184MHz/8, mc6845_intf_irq1)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-8-1)
+ MCFG_MC6845_ADD("crtc", R6545_1, XTAL_22_1184MHz/8, mc6845_intf_irq1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(blitz68k)
- MDRV_VIDEO_UPDATE(blitz68k)
+ MCFG_VIDEO_START(blitz68k)
+ MCFG_VIDEO_UPDATE(blitz68k)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bankrob, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
- MDRV_CPU_PROGRAM_MAP(bankrob_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold) // protection prevents correct irq frequency by crtc
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
+ MCFG_CPU_PROGRAM_MAP(bankrob_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold) // protection prevents correct irq frequency by crtc
// irq 2 reads from MCUs
// MC68HC705C8P (MCU1)
// MC68HC705C8P (MCU2)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
- MDRV_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
+ MCFG_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(blitz68k)
- MDRV_VIDEO_UPDATE(blitz68k)
+ MCFG_VIDEO_START(blitz68k)
+ MCFG_VIDEO_UPDATE(blitz68k)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bankroba, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
- MDRV_CPU_PROGRAM_MAP(bankroba_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold) // protection prevents correct irq frequency by crtc
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
+ MCFG_CPU_PROGRAM_MAP(bankroba_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold) // protection prevents correct irq frequency by crtc
// irq 3,4 read from MCUs
// MC68HC705C8P (MCU)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0+7, 256-1)
- MDRV_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq5)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+7, 256-1)
+ MCFG_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq5)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(blitz68k_addr_factor1)
- MDRV_VIDEO_UPDATE(blitz68k)
+ MCFG_VIDEO_START(blitz68k_addr_factor1)
+ MCFG_VIDEO_UPDATE(blitz68k)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( deucesw2, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz / 2)
- MDRV_CPU_PROGRAM_MAP(deucesw2_map)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(deucesw2_map)
// irq 2 reads from MCUs
// MC68HC705C8P (MCU)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
- MDRV_MC6845_ADD("crtc", R6545_1, XTAL_22_1184MHz/8, mc6845_intf_irq3)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+ MCFG_MC6845_ADD("crtc", R6545_1, XTAL_22_1184MHz/8, mc6845_intf_irq3)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(blitz68k)
- MDRV_VIDEO_UPDATE(blitz68k)
+ MCFG_VIDEO_START(blitz68k)
+ MCFG_VIDEO_UPDATE(blitz68k)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dualgame, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
- MDRV_CPU_PROGRAM_MAP(dualgame_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
+ MCFG_CPU_PROGRAM_MAP(dualgame_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank
// MC68HC705C8P (MCU1)
// MC68HC705C8P (MCU2)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
- MDRV_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
+ MCFG_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(blitz68k)
- MDRV_VIDEO_UPDATE(blitz68k)
+ MCFG_VIDEO_START(blitz68k)
+ MCFG_VIDEO_UPDATE(blitz68k)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hermit, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2 )
- MDRV_CPU_PROGRAM_MAP(hermit_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) // protection prevents correct irq frequency by crtc
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2 )
+ MCFG_CPU_PROGRAM_MAP(hermit_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold) // protection prevents correct irq frequency by crtc
// MC68HC705C8P (MCU)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
- MDRV_MC6845_ADD("crtc", H46505, XTAL_22_1184MHz/8, mc6845_intf_irq1)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
+ MCFG_MC6845_ADD("crtc", H46505, XTAL_22_1184MHz/8, mc6845_intf_irq1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(blitz68k)
- MDRV_VIDEO_UPDATE(blitz68k)
+ MCFG_VIDEO_START(blitz68k)
+ MCFG_VIDEO_UPDATE(blitz68k)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( maxidbl, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
- MDRV_CPU_PROGRAM_MAP(maxidbl_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold) // protection prevents correct irq frequency by crtc
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
+ MCFG_CPU_PROGRAM_MAP(maxidbl_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold) // protection prevents correct irq frequency by crtc
// irq 2 reads from MCUs
// MC68HC705C8P (MCU1)
@@ -1925,23 +1925,23 @@ static MACHINE_CONFIG_START( maxidbl, driver_device )
// MC68HC705C8P (MCU3)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
- MDRV_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+ MCFG_MC6845_ADD("crtc", H46505, XTAL_11_0592MHz/4, mc6845_intf_irq3)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_UPDATE(blitz68k_noblit)
+ MCFG_VIDEO_UPDATE(blitz68k_noblit)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("saa", SAA1099, XTAL_8MHz/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("saa", SAA1099, XTAL_8MHz/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index db089bfd5f2..41c59eb311d 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -320,55 +320,55 @@ static MACHINE_RESET( blktiger )
static MACHINE_CONFIG_START( blktiger, blktiger_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(blktiger_map)
- MDRV_CPU_IO_MAP(blktiger_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(blktiger_map)
+ MCFG_CPU_IO_MAP(blktiger_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(blktiger_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(blktiger_sound_map)
- MDRV_CPU_ADD("mcu", I8751, XTAL_24MHz/4) /* ??? */
- MDRV_CPU_PROGRAM_MAP(blktiger_mcu_map)
- MDRV_CPU_IO_MAP(blktiger_mcu_io_map)
- //MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", I8751, XTAL_24MHz/4) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(blktiger_mcu_map)
+ MCFG_CPU_IO_MAP(blktiger_mcu_io_map)
+ //MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(blktiger)
- MDRV_MACHINE_RESET(blktiger)
+ MCFG_MACHINE_START(blktiger)
+ MCFG_MACHINE_RESET(blktiger)
/* 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(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)
+ 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)
- MDRV_GFXDECODE(blktiger)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(blktiger)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(blktiger)
- MDRV_VIDEO_EOF(blktiger)
- MDRV_VIDEO_UPDATE(blktiger)
+ MCFG_VIDEO_START(blktiger)
+ MCFG_VIDEO_EOF(blktiger)
+ MCFG_VIDEO_UPDATE(blktiger)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( blktigerbl, blktiger )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(blktigerbl_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(blktigerbl_io_map)
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index 17999684a9d..20fae8e685c 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -359,33 +359,33 @@ static MACHINE_RESET( blmbycar )
static MACHINE_CONFIG_START( blmbycar, blmbycar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(blmbycar_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(blmbycar_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_MACHINE_START(blmbycar)
- MDRV_MACHINE_RESET(blmbycar)
+ MCFG_MACHINE_START(blmbycar)
+ MCFG_MACHINE_RESET(blmbycar)
/* 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(0x180, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0x100-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(0x180, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0x100-1)
- MDRV_GFXDECODE(blmbycar)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_GFXDECODE(blmbycar)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_VIDEO_START(blmbycar)
- MDRV_VIDEO_UPDATE(blmbycar)
+ MCFG_VIDEO_START(blmbycar)
+ MCFG_VIDEO_UPDATE(blmbycar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1056000, 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("oki", 1056000, 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
@@ -406,33 +406,33 @@ static MACHINE_RESET( watrball )
static MACHINE_CONFIG_START( watrball, blmbycar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(watrball_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(watrball_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_MACHINE_START(watrball)
- MDRV_MACHINE_RESET(watrball)
+ MCFG_MACHINE_START(watrball)
+ MCFG_MACHINE_RESET(watrball)
/* 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(0x180, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x180-1, 16, 0x100-1)
+ 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(0x180, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 16, 0x100-1)
- MDRV_GFXDECODE(blmbycar)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_GFXDECODE(blmbycar)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_VIDEO_START(blmbycar)
- MDRV_VIDEO_UPDATE(blmbycar)
+ MCFG_VIDEO_START(blmbycar)
+ MCFG_VIDEO_UPDATE(blmbycar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1056000, 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("oki", 1056000, 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/blockade.c b/src/mame/drivers/blockade.c
index a28a8933507..0b5d8be9045 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -483,53 +483,53 @@ static MACHINE_RESET( blockade )
static MACHINE_CONFIG_START( blockade, blockade_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK/10)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", blockade_interrupt)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/10)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", blockade_interrupt)
- MDRV_MACHINE_START(blockade)
- MDRV_MACHINE_RESET(blockade)
+ MCFG_MACHINE_START(blockade)
+ MCFG_MACHINE_RESET(blockade)
/* 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, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
+ 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, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(blockade)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(blockade)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(green)
- MDRV_VIDEO_START(blockade)
- MDRV_VIDEO_UPDATE(blockade)
+ MCFG_PALETTE_INIT(green)
+ MCFG_VIDEO_START(blockade)
+ MCFG_VIDEO_UPDATE(blockade)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(blockade_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(blockade_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(blockade)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(blockade)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( comotion, blockade )
- MDRV_PALETTE_INIT(bw)
+ MCFG_PALETTE_INIT(bw)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( blasto, blockade )
- MDRV_GFXDECODE(blasto)
- MDRV_PALETTE_INIT(bw)
+ MCFG_GFXDECODE(blasto)
+ MCFG_PALETTE_INIT(bw)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hustle, blockade )
- MDRV_GFXDECODE(blasto)
- MDRV_PALETTE_INIT(yellow)
+ MCFG_GFXDECODE(blasto)
+ MCFG_PALETTE_INIT(yellow)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index 7d50972857b..68bd0c4f294 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -220,40 +220,40 @@ static MACHINE_RESET( blockhl )
static MACHINE_CONFIG_START( blockhl, blockhl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI,3000000) /* Konami custom 052526 */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", blockhl_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI,3000000) /* Konami custom 052526 */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", blockhl_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_MACHINE_START(blockhl)
- MDRV_MACHINE_RESET(blockhl)
+ MCFG_MACHINE_START(blockhl)
+ MCFG_MACHINE_RESET(blockhl)
/* 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(14*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(blockhl)
- MDRV_VIDEO_UPDATE(blockhl)
+ MCFG_VIDEO_START(blockhl)
+ MCFG_VIDEO_UPDATE(blockhl)
- MDRV_K052109_ADD("k052109", blockhl_k052109_intf)
- MDRV_K051960_ADD("k051960", blockhl_k051960_intf)
+ MCFG_K052109_ADD("k052109", blockhl_k052109_intf)
+ MCFG_K051960_ADD("k051960", blockhl_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index 04e7123d88f..dbfc0031a94 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -272,40 +272,40 @@ static MACHINE_RESET( blockout )
static MACHINE_CONFIG_START( blockout, blockout_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(blockout_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(blockout_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_MACHINE_START(blockout)
- MDRV_MACHINE_RESET(blockout)
+ MCFG_MACHINE_START(blockout)
+ MCFG_MACHINE_RESET(blockout)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 8, 247)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 8, 247)
- MDRV_PALETTE_LENGTH(513)
+ MCFG_PALETTE_LENGTH(513)
- MDRV_VIDEO_START(blockout)
- MDRV_VIDEO_UPDATE(blockout)
+ MCFG_VIDEO_START(blockout)
+ MCFG_VIDEO_UPDATE(blockout)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index d0f606d062d..9cc0590f026 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -422,28 +422,28 @@ GFXDECODE_END
static MACHINE_CONFIG_START( bloodbro, driver_device )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bloodbro_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(bloodbro_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU_SOUND_SYSTEM_CPU(XTAL_7_15909MHz/2) /* verified on pcb */
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
// video hardware
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.39) /* verified on pcb */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.39) /* verified on pcb */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(bloodbro)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(bloodbro)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(bloodbro)
- MDRV_VIDEO_UPDATE(bloodbro)
+ MCFG_VIDEO_START(bloodbro)
+ MCFG_VIDEO_UPDATE(bloodbro)
// sound hardware
SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_7_15909MHz/2, XTAL_12MHz/12)
@@ -451,22 +451,22 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( weststry, bloodbro )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(weststry_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(weststry_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_GFXDECODE(weststry)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(weststry)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_UPDATE(weststry)
+ MCFG_VIDEO_UPDATE(weststry)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( skysmash, bloodbro )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_VIDEO_UPDATE(skysmash)
+ MCFG_VIDEO_UPDATE(skysmash)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index ffb7d94f53c..6ec5d155ded 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -203,30 +203,30 @@ GFXDECODE_END
static MACHINE_CONFIG_START( blstroid, blstroid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(blstroid)
- MDRV_MACHINE_RESET(blstroid)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(blstroid)
+ MCFG_MACHINE_RESET(blstroid)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(blstroid)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(blstroid)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 320*2, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 320*2, 262, 0, 240)
- MDRV_VIDEO_START(blstroid)
- MDRV_VIDEO_UPDATE(blstroid)
+ MCFG_VIDEO_START(blstroid)
+ MCFG_VIDEO_UPDATE(blstroid)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_i_stereo)
+ MCFG_FRAGMENT_ADD(jsa_i_stereo)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index d813335eb1f..d2d57909f13 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -300,43 +300,43 @@ static MACHINE_RESET( blueprnt )
static MACHINE_CONFIG_START( blueprnt, blueprnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 7000000/2) // 3.5 MHz
- MDRV_CPU_PROGRAM_MAP(blueprnt_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 7000000/2) // 3.5 MHz
+ MCFG_CPU_PROGRAM_MAP(blueprnt_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 10000000/2/2/2) // 1.25 MHz (2H)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // IRQs connected to 32V
+ MCFG_CPU_ADD("audiocpu", Z80, 10000000/2/2/2) // 1.25 MHz (2H)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // IRQs connected to 32V
// NMIs are caused by the main CPU
- MDRV_MACHINE_START(blueprnt)
- MDRV_MACHINE_RESET(blueprnt)
+ MCFG_MACHINE_START(blueprnt)
+ MCFG_MACHINE_RESET(blueprnt)
/* 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)
+ 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)
- MDRV_GFXDECODE(blueprnt)
- MDRV_PALETTE_LENGTH(128*4+8)
+ MCFG_GFXDECODE(blueprnt)
+ MCFG_PALETTE_LENGTH(128*4+8)
- MDRV_PALETTE_INIT(blueprnt)
- MDRV_VIDEO_START(blueprnt)
- MDRV_VIDEO_UPDATE(blueprnt)
+ MCFG_PALETTE_INIT(blueprnt)
+ MCFG_VIDEO_START(blueprnt)
+ MCFG_VIDEO_UPDATE(blueprnt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 10000000/2/2/2)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 10000000/2/2/2)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 10000000/2/2/2/2)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 10000000/2/2/2/2)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index c595007e89a..a98fe2e75ca 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -481,39 +481,39 @@ static INTERRUPT_GEN( bmc_interrupt )
}
static MACHINE_CONFIG_START( bmcbowl, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 21477270/2 )
- MDRV_CPU_PROGRAM_MAP(bmcbowl_mem)
- MDRV_CPU_VBLANK_INT_HACK(bmc_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 21477270/2 )
+ MCFG_CPU_PROGRAM_MAP(bmcbowl_mem)
+ MCFG_CPU_VBLANK_INT_HACK(bmc_interrupt,2)
- 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(35*8, 30*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 0*8, 29*8-1)
+ 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(35*8, 30*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 0*8, 29*8-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(bmcbowl)
- MDRV_VIDEO_UPDATE(bmcbowl)
+ MCFG_VIDEO_START(bmcbowl)
+ MCFG_VIDEO_UPDATE(bmcbowl)
- MDRV_NVRAM_HANDLER(bmcbowl)
- MDRV_MACHINE_RESET(bmcbowl)
+ MCFG_NVRAM_HANDLER(bmcbowl)
+ MCFG_MACHINE_RESET(bmcbowl)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("aysnd", AY8910, 3579545/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 3579545/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
/* via */
- MDRV_VIA6522_ADD("via6522_0", 1000000, via_interface)
+ MCFG_VIA6522_ADD("via6522_0", 1000000, via_interface)
MACHINE_CONFIG_END
ROM_START( bmcbowl )
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 20797871d9e..f033289df38 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -1327,49 +1327,49 @@ static MACHINE_RESET( ms32 )
static MACHINE_CONFIG_START( bnstars, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V70, 20000000) // 20MHz
- MDRV_CPU_PROGRAM_MAP(bnstars_map)
- MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32)
+ MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz
+ MCFG_CPU_PROGRAM_MAP(bnstars_map)
+ MCFG_CPU_VBLANK_INT_HACK(ms32_interrupt,32)
-// MDRV_CPU_ADD("audiocpu", Z80, 4000000)
-// MDRV_CPU_PROGRAM_MAP(bnstars_z80_map)
+// MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+// MCFG_CPU_PROGRAM_MAP(bnstars_z80_map)
- MDRV_QUANTUM_TIME(HZ(60000))
+ MCFG_QUANTUM_TIME(HZ(60000))
- MDRV_MACHINE_RESET(ms32)
+ MCFG_MACHINE_RESET(ms32)
- MDRV_GFXDECODE(bnstars)
- MDRV_PALETTE_LENGTH(0x8000*2)
+ MCFG_GFXDECODE(bnstars)
+ MCFG_PALETTE_LENGTH(0x8000*2)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_VIDEO_START(bnstars)
- MDRV_VIDEO_UPDATE(bnstars)
+ MCFG_VIDEO_START(bnstars)
+ MCFG_VIDEO_UPDATE(bnstars)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf1", YMF271, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf1", YMF271, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("ymf2", YMF271, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf2", YMF271, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 25af886893c..d41c8f78229 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -245,39 +245,39 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( bogeyman, bogeyman_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", M6502, 1500000) /* Verified */
- MDRV_CPU_PROGRAM_MAP(bogeyman_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 16) // Controls sound
+ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* Verified */
+ MCFG_CPU_PROGRAM_MAP(bogeyman_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 16) // Controls sound
- MDRV_MACHINE_START(bogeyman)
- MDRV_MACHINE_RESET(bogeyman)
+ MCFG_MACHINE_START(bogeyman)
+ MCFG_MACHINE_RESET(bogeyman)
// video hardware
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- 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(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(bogeyman)
- MDRV_PALETTE_LENGTH(16+256)
+ MCFG_GFXDECODE(bogeyman)
+ MCFG_PALETTE_LENGTH(16+256)
- MDRV_PALETTE_INIT(bogeyman)
- MDRV_VIDEO_START(bogeyman)
- MDRV_VIDEO_UPDATE(bogeyman)
+ MCFG_PALETTE_INIT(bogeyman)
+ MCFG_VIDEO_START(bogeyman)
+ MCFG_VIDEO_UPDATE(bogeyman)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000) /* Verified */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000) /* Verified */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000) /* Verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000) /* Verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index 25d6dfa8034..6ca28be74c1 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -347,43 +347,43 @@ static MACHINE_RESET( bombjack )
static MACHINE_CONFIG_START( bombjack, bombjack_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz????? */
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_IO_MAP(audio_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz????? */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_IO_MAP(audio_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(bombjack)
- MDRV_MACHINE_RESET(bombjack)
+ MCFG_MACHINE_START(bombjack)
+ MCFG_MACHINE_RESET(bombjack)
/* 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)
+ 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)
- MDRV_GFXDECODE(bombjack)
- MDRV_PALETTE_LENGTH(128)
+ MCFG_GFXDECODE(bombjack)
+ MCFG_PALETTE_LENGTH(128)
- MDRV_VIDEO_START(bombjack)
- MDRV_VIDEO_UPDATE(bombjack)
+ MCFG_VIDEO_START(bombjack)
+ MCFG_VIDEO_UPDATE(bombjack)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
- MDRV_SOUND_ADD("ay3", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
+ MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index de419851fde..6451a87b8ae 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -325,45 +325,45 @@ static const deco16ic_interface boogwing_deco16ic_intf =
static MACHINE_CONFIG_START( boogwing, boogwing_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000) /* DE102 */
- MDRV_CPU_PROGRAM_MAP(boogwing_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* DE102 */
+ MCFG_CPU_PROGRAM_MAP(boogwing_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/4)
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/4)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_PALETTE_LENGTH(2048)
- MDRV_GFXDECODE(boogwing)
+ MCFG_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(boogwing)
- MDRV_VIDEO_UPDATE(boogwing)
+ MCFG_VIDEO_UPDATE(boogwing)
- MDRV_DECO16IC_ADD("deco_custom", boogwing_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", boogwing_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.40)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.40)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
/**********************************************************************************/
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 5db82305450..d4e5206adbc 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -364,48 +364,48 @@ static MACHINE_RESET( bottom9 )
static MACHINE_CONFIG_START( bottom9, bottom9_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", bottom9_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", bottom9_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_VBLANK_INT_HACK(bottom9_sound_interrupt,8) /* irq is triggered by the main CPU */
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_VBLANK_INT_HACK(bottom9_sound_interrupt,8) /* irq is triggered by the main CPU */
- MDRV_MACHINE_START(bottom9)
- MDRV_MACHINE_RESET(bottom9)
+ MCFG_MACHINE_START(bottom9)
+ MCFG_MACHINE_RESET(bottom9)
/* 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(14*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(bottom9)
- MDRV_VIDEO_UPDATE(bottom9)
+ MCFG_VIDEO_START(bottom9)
+ MCFG_VIDEO_UPDATE(bottom9)
- MDRV_K052109_ADD("k052109", bottom9_k052109_intf)
- MDRV_K051960_ADD("k051960", bottom9_k051960_intf)
- MDRV_K051316_ADD("k051316", bottom9_k051316_intf)
+ MCFG_K052109_ADD("k052109", bottom9_k052109_intf)
+ MCFG_K051960_ADD("k051960", bottom9_k051960_intf)
+ MCFG_K051316_ADD("k051316", bottom9_k051316_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("k007232_1", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_interface_1)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_interface_1)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ADD("k007232_2", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_interface_2)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ADD("k007232_2", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_interface_2)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index b3462b973a8..9c7a782d6d0 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -438,23 +438,23 @@ static MACHINE_RESET( boxer )
static MACHINE_CONFIG_START( boxer, boxer_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16)
- MDRV_CPU_PROGRAM_MAP(boxer_map)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16)
+ MCFG_CPU_PROGRAM_MAP(boxer_map)
- MDRV_MACHINE_START(boxer)
- MDRV_MACHINE_RESET(boxer)
+ MCFG_MACHINE_START(boxer)
+ MCFG_MACHINE_RESET(boxer)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 262)
- MDRV_SCREEN_VISIBLE_AREA(8, 247, 0, 239)
-
- MDRV_GFXDECODE(boxer)
- MDRV_PALETTE_LENGTH(4)
- MDRV_PALETTE_INIT(boxer)
- MDRV_VIDEO_UPDATE(boxer)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 262)
+ MCFG_SCREEN_VISIBLE_AREA(8, 247, 0, 239)
+
+ MCFG_GFXDECODE(boxer)
+ MCFG_PALETTE_LENGTH(4)
+ MCFG_PALETTE_INIT(boxer)
+ MCFG_VIDEO_UPDATE(boxer)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 94b7f857e90..f20e91aa9e2 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -387,63 +387,63 @@ static MACHINE_RESET( brkthru )
static MACHINE_CONFIG_START( brkthru, brkthru_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(brkthru_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(brkthru_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(brkthru)
- MDRV_MACHINE_RESET(brkthru)
+ MCFG_MACHINE_START(brkthru)
+ MCFG_MACHINE_RESET(brkthru)
/* video hardware */
- MDRV_GFXDECODE(brkthru)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(brkthru)
+ MCFG_PALETTE_LENGTH(256)
/* not sure; assuming to be the same as darwin */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 8, 248, 272, 8, 248)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 8, 248, 272, 8, 248)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_INIT(brkthru)
- MDRV_VIDEO_START(brkthru)
- MDRV_VIDEO_UPDATE(brkthru)
+ MCFG_PALETTE_INIT(brkthru)
+ MCFG_VIDEO_START(brkthru)
+ MCFG_VIDEO_UPDATE(brkthru)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( darwin, brkthru_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darwin_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(darwin_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(brkthru)
- MDRV_MACHINE_RESET(brkthru)
+ MCFG_MACHINE_START(brkthru)
+ MCFG_MACHINE_RESET(brkthru)
/* video hardware */
- MDRV_GFXDECODE(brkthru)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(brkthru)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 8, 248, 272, 8, 248)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 8, 248, 272, 8, 248)
/* frames per second, vblank duration
Horizontal video frequency:
HSync = Dot Clock / Horizontal Frame Length
@@ -456,24 +456,24 @@ static MACHINE_CONFIG_START( darwin, brkthru_state )
= 15.625kHz / (240 + 32)
= 57.444855Hz
tuned by Shingo SUZUKI(VSyncMAME Project) 2000/10/19 */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_INIT(brkthru)
- MDRV_VIDEO_START(brkthru)
- MDRV_VIDEO_UPDATE(brkthru)
+ MCFG_PALETTE_INIT(brkthru)
+ MCFG_VIDEO_START(brkthru)
+ MCFG_VIDEO_UPDATE(brkthru)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index 35c10d490c4..86ea40f7efa 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -250,34 +250,34 @@ static MACHINE_RESET( bsktball )
static MACHINE_CONFIG_START( bsktball, bsktball_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,750000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(bsktball_interrupt,8)
+ MCFG_CPU_ADD("maincpu", M6502,750000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(bsktball_interrupt,8)
- MDRV_MACHINE_START(bsktball)
- MDRV_MACHINE_RESET(bsktball)
+ MCFG_MACHINE_START(bsktball)
+ MCFG_MACHINE_RESET(bsktball)
/* 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, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
+ 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, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(bsktball)
- MDRV_PALETTE_LENGTH(2*4 + 4*4*4*4)
+ MCFG_GFXDECODE(bsktball)
+ MCFG_PALETTE_LENGTH(2*4 + 4*4*4*4)
- MDRV_PALETTE_INIT(bsktball)
- MDRV_VIDEO_START(bsktball)
- MDRV_VIDEO_UPDATE(bsktball)
+ MCFG_PALETTE_INIT(bsktball)
+ MCFG_VIDEO_START(bsktball)
+ MCFG_VIDEO_UPDATE(bsktball)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(bsktball)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(bsktball)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 627dcf67bbe..22cb59545a4 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -1490,80 +1490,80 @@ static MACHINE_RESET( mmonkey )
static MACHINE_CONFIG_START( btime, btime_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, HCLK2) /* seletable between H2/H4 via jumper */
- MDRV_CPU_PROGRAM_MAP(btime_map)
+ MCFG_CPU_ADD("maincpu", M6502, HCLK2) /* seletable between H2/H4 via jumper */
+ MCFG_CPU_PROGRAM_MAP(btime_map)
- MDRV_CPU_ADD("audiocpu", M6502, HCLK1/3/2)
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_TIMER_ADD_SCANLINE("audionmi", audio_nmi_gen, "screen", 0, 8)
+ MCFG_CPU_ADD("audiocpu", M6502, HCLK1/3/2)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_TIMER_ADD_SCANLINE("audionmi", audio_nmi_gen, "screen", 0, 8)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(HCLK, 384, 8, 248, 272, 8, 248)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(HCLK, 384, 8, 248, 272, 8, 248)
- MDRV_MACHINE_START(btime)
- MDRV_MACHINE_RESET(btime)
+ MCFG_MACHINE_START(btime)
+ MCFG_MACHINE_RESET(btime)
- MDRV_GFXDECODE(btime)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(btime)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(btime)
- MDRV_VIDEO_START(btime)
- MDRV_VIDEO_UPDATE(btime)
+ MCFG_PALETTE_INIT(btime)
+ MCFG_VIDEO_START(btime)
+ MCFG_VIDEO_UPDATE(btime)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ay1", AY8910, HCLK2)
- MDRV_SOUND_CONFIG(ay1_intf)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
- MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 1)
- MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 2)
-
- MDRV_SOUND_ADD("ay2", AY8910, HCLK2)
- MDRV_SOUND_CONFIG(ay2_intf)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 3)
- MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 4)
- MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 5)
-
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(btime_sound)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ay1", AY8910, HCLK2)
+ MCFG_SOUND_CONFIG(ay1_intf)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
+ MCFG_SOUND_ROUTE_EX(1, "discrete", 1.0, 1)
+ MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 2)
+
+ MCFG_SOUND_ADD("ay2", AY8910, HCLK2)
+ MCFG_SOUND_CONFIG(ay2_intf)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 3)
+ MCFG_SOUND_ROUTE_EX(1, "discrete", 1.0, 4)
+ MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 5)
+
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(btime_sound)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cookrace, btime )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cookrace_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cookrace_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
- MDRV_GFXDECODE(cookrace)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(cookrace)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_UPDATE(cookrace)
+ MCFG_VIDEO_UPDATE(cookrace)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lnc, btime )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lnc_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(lnc_map)
- MDRV_MACHINE_RESET(lnc)
+ MCFG_MACHINE_RESET(lnc)
/* video hardware */
- MDRV_GFXDECODE(lnc)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_GFXDECODE(lnc)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(lnc)
- MDRV_VIDEO_UPDATE(lnc)
+ MCFG_PALETTE_INIT(lnc)
+ MCFG_VIDEO_UPDATE(lnc)
MACHINE_CONFIG_END
@@ -1572,33 +1572,33 @@ static MACHINE_CONFIG_DERIVED( wtennis, lnc )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_UPDATE(eggs)
+ MCFG_VIDEO_UPDATE(eggs)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mmonkey, wtennis )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mmonkey_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mmonkey_map)
- MDRV_MACHINE_START(mmonkey)
- MDRV_MACHINE_RESET(mmonkey)
+ MCFG_MACHINE_START(mmonkey)
+ MCFG_MACHINE_RESET(mmonkey)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sdtennis, btime )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(HCLK4)
- MDRV_CPU_PROGRAM_MAP(bnj_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(HCLK4)
+ MCFG_CPU_PROGRAM_MAP(bnj_map)
/* video hardware */
- MDRV_GFXDECODE(bnj)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(bnj)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(bnj)
- MDRV_VIDEO_UPDATE(bnj)
+ MCFG_VIDEO_START(bnj)
+ MCFG_VIDEO_UPDATE(bnj)
MACHINE_CONFIG_END
@@ -1607,61 +1607,61 @@ static MACHINE_CONFIG_DERIVED( bnj, sdtennis )
/* basic machine hardware */
/* video hardware */
- MDRV_DEVICE_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) // 256 * 240, confirmed
+ MCFG_DEVICE_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) // 256 * 240, confirmed
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( zoar, btime )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(zoar_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(zoar_map)
/* video hardware */
- MDRV_DEVICE_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) // 256 * 240, confirmed
+ MCFG_DEVICE_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) // 256 * 240, confirmed
- MDRV_GFXDECODE(zoar)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(zoar)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_VIDEO_UPDATE(zoar)
+ MCFG_VIDEO_UPDATE(zoar)
- MDRV_SOUND_REPLACE("ay1", AY8910, HCLK1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_CONFIG(ay1_intf)
+ MCFG_SOUND_REPLACE("ay1", AY8910, HCLK1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_CONFIG(ay1_intf)
- MDRV_SOUND_REPLACE("ay2", AY8910, HCLK1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_REPLACE("ay2", AY8910, HCLK1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( disco, btime )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(HCLK4)
- MDRV_CPU_PROGRAM_MAP(disco_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(HCLK4)
+ MCFG_CPU_PROGRAM_MAP(disco_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(disco_audio_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(disco_audio_map)
/* video hardware */
- MDRV_GFXDECODE(disco)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(disco)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_VIDEO_UPDATE(disco)
+ MCFG_VIDEO_UPDATE(disco)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tisland, btime )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tisland_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tisland_map)
/* video hardware */
- MDRV_GFXDECODE(zoar)
+ MCFG_GFXDECODE(zoar)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index f68e7d8ff4f..5c00f6c7521 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -334,34 +334,34 @@ static const tms34010_config tms_config =
static MACHINE_CONFIG_START( btoads, driver_device )
- MDRV_CPU_ADD("maincpu", TMS34020, CPU_CLOCK/2)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", TMS34020, CPU_CLOCK/2)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_assert, 183)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_assert, 183)
- MDRV_MACHINE_START(btoads)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(btoads)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_START(btoads)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(btoads)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 640, 0, 512, 257, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 640, 0, 512, 257, 0, 224)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("bsmt", BSMT2000, SOUND_CLOCK)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("bsmt", BSMT2000, SOUND_CLOCK)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 6eb942842c3..c88aa737d71 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -767,41 +767,41 @@ static MACHINE_RESET( tokio )
static MACHINE_CONFIG_START( tokio, bublbobl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(tokio_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_CPU_PROGRAM_MAP(tokio_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(tokio_slave_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_CPU_PROGRAM_MAP(tokio_slave_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(tokio_sound_map) // NMIs are triggered by the main CPU, IRQs are triggered by the YM2203
+ MCFG_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(tokio_sound_map) // NMIs are triggered by the main CPU, IRQs are triggered by the YM2203
- MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
+ MCFG_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
- MDRV_MACHINE_START(tokio)
- MDRV_MACHINE_RESET(tokio)
+ MCFG_MACHINE_START(tokio)
+ MCFG_MACHINE_RESET(tokio)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MAIN_XTAL/4, 384, 0, 256, 264, 16, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_XTAL/4, 384, 0, 256, 264, 16, 240)
- MDRV_GFXDECODE(bublbobl)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(bublbobl)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(bublbobl)
+ MCFG_VIDEO_UPDATE(bublbobl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, MAIN_XTAL/8)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.08)
- MDRV_SOUND_ROUTE(1, "mono", 0.08)
- MDRV_SOUND_ROUTE(2, "mono", 0.08)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, MAIN_XTAL/8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.08)
+ MCFG_SOUND_ROUTE(1, "mono", 0.08)
+ MCFG_SOUND_ROUTE(2, "mono", 0.08)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
MACHINE_CONFIG_END
@@ -848,45 +848,45 @@ static MACHINE_RESET( bublbobl )
static MACHINE_CONFIG_START( bublbobl, bublbobl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_CPU_PROGRAM_MAP(master_map)
// IRQs are triggered by the MCU
- MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map) // IRQs are triggered by the YM2203
+ MCFG_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(sound_map) // IRQs are triggered by the YM2203
- MDRV_CPU_ADD("mcu", M6801, 4000000) // actually 6801U4 // xtal is 4MHz, divided by 4 internally
- MDRV_CPU_PROGRAM_MAP(mcu_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse) // comes from the same clock that latches the INT pin on the second Z80
+ MCFG_CPU_ADD("mcu", M6801, 4000000) // actually 6801U4 // xtal is 4MHz, divided by 4 internally
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_pulse) // comes from the same clock that latches the INT pin on the second Z80
- MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
+ MCFG_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
- MDRV_MACHINE_START(bublbobl)
- MDRV_MACHINE_RESET(bublbobl)
+ MCFG_MACHINE_START(bublbobl)
+ MCFG_MACHINE_RESET(bublbobl)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MAIN_XTAL/4, 384, 0, 256, 264, 16, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_XTAL/4, 384, 0, 256, 264, 16, 240)
- MDRV_GFXDECODE(bublbobl)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(bublbobl)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(bublbobl)
+ MCFG_VIDEO_UPDATE(bublbobl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, MAIN_XTAL/8)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ym1", YM2203, MAIN_XTAL/8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ym2", YM3526, MAIN_XTAL/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ym2", YM3526, MAIN_XTAL/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -912,14 +912,14 @@ static MACHINE_RESET( boblbobl )
static MACHINE_CONFIG_DERIVED( boblbobl, bublbobl )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bootleg_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // interrupt mode 1, unlike Bubble Bobble
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) // interrupt mode 1, unlike Bubble Bobble
- MDRV_MACHINE_START(boblbobl)
- MDRV_MACHINE_RESET(boblbobl)
+ MCFG_MACHINE_START(boblbobl)
+ MCFG_MACHINE_RESET(boblbobl)
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
@@ -956,14 +956,14 @@ static MACHINE_RESET( bub68705 )
}
static MACHINE_CONFIG_DERIVED( bub68705, bublbobl )
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
- MDRV_CPU_ADD("mcu", M68705, 4000000) // xtal is 4MHz, divided by 4 internally
- MDRV_CPU_PROGRAM_MAP(bootlegmcu_map)
- MDRV_CPU_VBLANK_INT_HACK(bublbobl_m68705_interrupt, 2) // ??? should come from the same clock which latches the INT pin on the second Z80
+ MCFG_CPU_ADD("mcu", M68705, 4000000) // xtal is 4MHz, divided by 4 internally
+ MCFG_CPU_PROGRAM_MAP(bootlegmcu_map)
+ MCFG_CPU_VBLANK_INT_HACK(bublbobl_m68705_interrupt, 2) // ??? should come from the same clock which latches the INT pin on the second Z80
- MDRV_MACHINE_START(bub68705)
- MDRV_MACHINE_RESET(bub68705)
+ MCFG_MACHINE_START(bub68705)
+ MCFG_MACHINE_RESET(bub68705)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index 971da0cec87..e8c7efe643f 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -396,58 +396,58 @@ static MACHINE_RESET( buggychl )
static MACHINE_CONFIG_START( buggychl, buggychl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz??? */
- MDRV_CPU_PROGRAM_MAP(buggychl_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(buggychl_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,60) /* irq is timed, tied to the cpu clock and not to vblank */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,60) /* irq is timed, tied to the cpu clock and not to vblank */
/* nmi is caused by the main cpu */
- MDRV_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(buggychl_mcu_map)
- MDRV_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
+ MCFG_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(buggychl_mcu_map)
+ MCFG_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
- MDRV_MACHINE_START(buggychl)
- MDRV_MACHINE_RESET(buggychl)
+ MCFG_MACHINE_START(buggychl)
+ MCFG_MACHINE_RESET(buggychl)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(buggychl)
- MDRV_PALETTE_LENGTH(128+128)
+ MCFG_GFXDECODE(buggychl)
+ MCFG_PALETTE_LENGTH(128+128)
- MDRV_PALETTE_INIT(buggychl)
- MDRV_VIDEO_START(buggychl)
- MDRV_VIDEO_UPDATE(buggychl)
+ MCFG_PALETTE_INIT(buggychl)
+ MCFG_VIDEO_START(buggychl)
+ MCFG_VIDEO_UPDATE(buggychl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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("ay1", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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
diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c
index 36d24f07494..fbb16190484 100644
--- a/src/mame/drivers/buster.c
+++ b/src/mame/drivers/buster.c
@@ -71,29 +71,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( buster, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(mainmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(mainmap)
+ 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_GFXDECODE(buster)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(buster)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(buster)
- MDRV_VIDEO_UPDATE(buster)
+ MCFG_VIDEO_START(buster)
+ MCFG_VIDEO_UPDATE(buster)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000/2)
-// MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000/2)
+// MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index 9ad264a8b80..123d5ed9831 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -712,31 +712,31 @@ static const pokey_interface pokey_interface_2 =
static MACHINE_CONFIG_START( bwidow, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(bwidow_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(bwidow_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 480, 0, 440)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 480, 0, 440)
- MDRV_VIDEO_START(avg)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(avg)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -745,34 +745,34 @@ static MACHINE_CONFIG_DERIVED( gravitar, bwidow )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 420, 0, 400)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 420, 0, 400)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lunarbat, gravitar )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spacduel_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spacduel_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(45)
- MDRV_SCREEN_VISIBLE_AREA(0, 500, 0, 440)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(45)
+ MCFG_SCREEN_VISIBLE_AREA(0, 500, 0, 440)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spacduel, gravitar )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spacduel_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spacduel_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(45)
- MDRV_SCREEN_VISIBLE_AREA(0, 540, 0, 400)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(45)
+ MCFG_SCREEN_VISIBLE_AREA(0, 540, 0, 400)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index 57be6700a96..c88d4ef759d 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -417,51 +417,51 @@ static MACHINE_RESET( bwing )
static MACHINE_CONFIG_START( bwing, bwing_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(bwp1_map)
- MDRV_CPU_VBLANK_INT_HACK(bwp1_interrupt, 3)
+ MCFG_CPU_ADD("maincpu", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(bwp1_map)
+ MCFG_CPU_VBLANK_INT_HACK(bwp1_interrupt, 3)
- MDRV_CPU_ADD("sub", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(bwp2_map)
-// MDRV_CPU_VBLANK_INT("screen", irq1_line_assert) // vblank triggers FIRQ on CPU2 by design (unused)
+ MCFG_CPU_ADD("sub", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(bwp2_map)
+// MCFG_CPU_VBLANK_INT("screen", irq1_line_assert) // vblank triggers FIRQ on CPU2 by design (unused)
- MDRV_CPU_ADD("audiocpu", DECO16, 2000000)
- MDRV_CPU_PROGRAM_MAP(bwp3_map)
- MDRV_CPU_IO_MAP(bwp3_io_map)
- MDRV_CPU_PERIODIC_INT(bwp3_interrupt, 1000)
+ MCFG_CPU_ADD("audiocpu", DECO16, 2000000)
+ MCFG_CPU_PROGRAM_MAP(bwp3_map)
+ MCFG_CPU_IO_MAP(bwp3_io_map)
+ MCFG_CPU_PERIODIC_INT(bwp3_interrupt, 1000)
- MDRV_QUANTUM_TIME(HZ(18000)) // high enough?
+ MCFG_QUANTUM_TIME(HZ(18000)) // high enough?
- MDRV_MACHINE_START(bwing)
- MDRV_MACHINE_RESET(bwing)
+ MCFG_MACHINE_START(bwing)
+ MCFG_MACHINE_RESET(bwing)
// video hardware
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600)) // must be long enough for polling
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600)) // must be long enough for polling
+ 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)
- MDRV_GFXDECODE(bwing)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(bwing)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_VIDEO_START(bwing)
- MDRV_VIDEO_UPDATE(bwing)
+ MCFG_VIDEO_START(bwing)
+ MCFG_VIDEO_UPDATE(bwing)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
//****************************************************************************
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index f320f928a72..a4eb409daa8 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -558,30 +558,30 @@ static const pokey_interface redbaron_pokey_interface =
static MACHINE_CONFIG_START( bzone_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, BZONE_MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(bzone_map)
- MDRV_CPU_PERIODIC_INT(bzone_interrupt, (double)BZONE_MASTER_CLOCK / 4096 / 12)
+ MCFG_CPU_ADD("maincpu", M6502, BZONE_MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(bzone_map)
+ MCFG_CPU_PERIODIC_INT(bzone_interrupt, (double)BZONE_MASTER_CLOCK / 4096 / 12)
- MDRV_MACHINE_START(bzone)
+ MCFG_MACHINE_START(bzone)
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(40)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 580, 0, 400)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(40)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 580, 0, 400)
- MDRV_VIDEO_START(avg_bzone)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(avg_bzone)
+ MCFG_VIDEO_UPDATE(vector)
/* Drivers */
- MDRV_MATHBOX_ADD("mathbox")
+ MCFG_MATHBOX_ADD("mathbox")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bzone, bzone_base )
/* sound hardware */
- MDRV_FRAGMENT_ADD(bzone_audio)
+ MCFG_FRAGMENT_ADD(bzone_audio)
MACHINE_CONFIG_END
@@ -590,31 +590,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( redbaron, bzone_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(redbaron_map)
- MDRV_CPU_PERIODIC_INT(bzone_interrupt, (double)BZONE_MASTER_CLOCK / 4096 / 12)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(redbaron_map)
+ MCFG_CPU_PERIODIC_INT(bzone_interrupt, (double)BZONE_MASTER_CLOCK / 4096 / 12)
- MDRV_MACHINE_START(redbaron)
+ MCFG_MACHINE_START(redbaron)
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VISIBLE_AREA(0, 520, 0, 400)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VISIBLE_AREA(0, 520, 0, 400)
- MDRV_VIDEO_START(avg_bzone)
+ MCFG_VIDEO_START(avg_bzone)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey", POKEY, 1500000)
- MDRV_SOUND_CONFIG(redbaron_pokey_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("pokey", POKEY, 1500000)
+ MCFG_SOUND_CONFIG(redbaron_pokey_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("custom", REDBARON, 0)
+ MCFG_SOUND_ADD("custom", REDBARON, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 8c74913873e..fcf58f082f8 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -487,41 +487,41 @@ static const msm5205_interface msm5205_interface_2 =
static MACHINE_CONFIG_START( cabal, cabal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.60) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.60) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(cabal)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(cabal)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(cabal)
- MDRV_VIDEO_UPDATE(cabal)
+ MCFG_VIDEO_START(cabal)
+ MCFG_VIDEO_UPDATE(cabal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(seibu_ym2151_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(seibu_ym2151_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
- MDRV_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.40)
+ MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.40)
- MDRV_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.40)
+ MCFG_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.40)
MACHINE_CONFIG_END
@@ -529,56 +529,56 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cabalbl, cabal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cabalbl_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cabalbl_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cabalbl_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cabalbl_sound_map)
/* there are 2x z80s for the ADPCM */
- MDRV_CPU_ADD("adpcm1", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cabalbl_talk1_map)
- MDRV_CPU_IO_MAP(cabalbl_talk1_portmap)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
+ MCFG_CPU_ADD("adpcm1", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cabalbl_talk1_map)
+ MCFG_CPU_IO_MAP(cabalbl_talk1_portmap)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,8000)
- MDRV_CPU_ADD("adpcm2", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cabalbl_talk2_map)
- MDRV_CPU_IO_MAP(cabalbl_talk2_portmap)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
+ MCFG_CPU_ADD("adpcm2", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cabalbl_talk2_map)
+ MCFG_CPU_IO_MAP(cabalbl_talk2_portmap)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,8000)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(cabalbl)
+ MCFG_MACHINE_RESET(cabalbl)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(cabal)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(cabal)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(cabal)
- MDRV_VIDEO_UPDATE(cabal)
+ MCFG_VIDEO_START(cabal)
+ MCFG_VIDEO_UPDATE(cabal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(cabalbl_ym2151_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(cabalbl_ym2151_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
- MDRV_SOUND_ADD("msm1", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator) */
- MDRV_SOUND_CONFIG(msm5205_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator) */
+ MCFG_SOUND_CONFIG(msm5205_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("msm2", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator)*/
- MDRV_SOUND_CONFIG(msm5205_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator)*/
+ MCFG_SOUND_CONFIG(msm5205_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
ROM_START( cabal )
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
index 7d5714d75c5..4dc7ec99c1f 100644
--- a/src/mame/drivers/cabaret.c
+++ b/src/mame/drivers/cabaret.c
@@ -305,31 +305,31 @@ static INTERRUPT_GEN( cabaret_interrupt )
static MACHINE_CONFIG_START( cabaret, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2)
- MDRV_CPU_PROGRAM_MAP(cabaret_map)
- MDRV_CPU_IO_MAP(cabaret_portmap)
- MDRV_CPU_VBLANK_INT("screen",cabaret_interrupt)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(cabaret_map)
+ MCFG_CPU_IO_MAP(cabaret_portmap)
+ MCFG_CPU_VBLANK_INT("screen",cabaret_interrupt)
- MDRV_MACHINE_RESET(cabaret)
+ MCFG_MACHINE_RESET(cabaret)
/* 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-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-1)
- MDRV_GFXDECODE(cabaret)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(cabaret)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(cabaret)
- MDRV_VIDEO_UPDATE(cabaret)
+ MCFG_VIDEO_START(cabaret)
+ MCFG_VIDEO_UPDATE(cabaret)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c
index e401b423a70..f3e6c1eecf9 100644
--- a/src/mame/drivers/calchase.c
+++ b/src/mame/drivers/calchase.c
@@ -649,36 +649,36 @@ static void calchase_set_keyb_int(running_machine *machine, int state) {
static MACHINE_CONFIG_START( calchase, driver_device )
- MDRV_CPU_ADD("maincpu", PENTIUM, 200000000) // Cyrix 686MX-PR200 CPU
- MDRV_CPU_PROGRAM_MAP(calchase_map)
- MDRV_CPU_IO_MAP(calchase_io)
-
- MDRV_MACHINE_START(calchase)
- MDRV_MACHINE_RESET(calchase)
-
- MDRV_PIT8254_ADD( "pit8254", calchase_pit8254_config )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
- MDRV_PIC8259_ADD( "pic8259_1", calchase_pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", calchase_pic8259_2_config )
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
- MDRV_PCI_BUS_ADD("pcibus", 0)
- MDRV_PCI_BUS_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w)
- MDRV_PCI_BUS_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
-
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_GFXDECODE( CGA )
-
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
-
- MDRV_VIDEO_START(calchase)
- MDRV_VIDEO_UPDATE(calchase)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 200000000) // Cyrix 686MX-PR200 CPU
+ MCFG_CPU_PROGRAM_MAP(calchase_map)
+ MCFG_CPU_IO_MAP(calchase_io)
+
+ MCFG_MACHINE_START(calchase)
+ MCFG_MACHINE_RESET(calchase)
+
+ MCFG_PIT8254_ADD( "pit8254", calchase_pit8254_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
+ MCFG_PIC8259_ADD( "pic8259_1", calchase_pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_2", calchase_pic8259_2_config )
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_PCI_BUS_ADD("pcibus", 0)
+ MCFG_PCI_BUS_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w)
+ MCFG_PCI_BUS_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
+
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE( CGA )
+
+ 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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
+
+ MCFG_VIDEO_START(calchase)
+ MCFG_VIDEO_UPDATE(calchase)
MACHINE_CONFIG_END
static DRIVER_INIT( calchase )
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index ac81eed0b13..076f42202e8 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -2738,40 +2738,40 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( sys903, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
- MDRV_CPU_PROGRAM_MAP(sys903_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
+ MCFG_CPU_PROGRAM_MAP(sys903_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", sys903_pia0_intf)
- MDRV_PIA6821_ADD("pia1", sys903_pia1_intf)
+ MCFG_PIA6821_ADD("pia0", sys903_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", sys903_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) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 31*8-1) /* Taken from MC6845 init, registers 01 & 06 */
+ 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) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 31*8-1) /* Taken from MC6845 init, registers 01 & 06 */
- MDRV_GFXDECODE(calomega)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(calomega)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(calomega)
- MDRV_VIDEO_START(calomega)
- MDRV_VIDEO_UPDATE(calomega)
+ MCFG_PALETTE_INIT(calomega)
+ MCFG_VIDEO_START(calomega)
+ MCFG_VIDEO_UPDATE(calomega)
- MDRV_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf) /* 6845 @ CPU clock */
+ MCFG_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf) /* 6845 @ CPU clock */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8912", AY8912, SND_CLOCK) /* confirmed */
- MDRV_SOUND_CONFIG(sys903_ay8912_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay8912", AY8912, SND_CLOCK) /* confirmed */
+ MCFG_SOUND_CONFIG(sys903_ay8912_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
/* acia */
- MDRV_ACIA6850_ADD("acia6850_0", acia6850_intf)
+ MCFG_ACIA6850_ADD("acia6850_0", acia6850_intf)
MACHINE_CONFIG_END
@@ -2779,15 +2779,15 @@ static MACHINE_CONFIG_DERIVED( s903mod, sys903 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(s903mod_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(s903mod_map)
/* sound hardware */
- MDRV_SOUND_MODIFY("ay8912")
- MDRV_SOUND_CONFIG(sys905_ay8912_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_MODIFY("ay8912")
+ MCFG_SOUND_CONFIG(sys905_ay8912_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_DEVICE_REMOVE("acia6850_0")
+ MCFG_DEVICE_REMOVE("acia6850_0")
MACHINE_CONFIG_END
@@ -2795,18 +2795,18 @@ static MACHINE_CONFIG_DERIVED( sys905, sys903 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sys905_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sys905_map)
- MDRV_PIA6821_MODIFY("pia0", sys905_pia0_intf)
- MDRV_PIA6821_MODIFY("pia1", sys905_pia1_intf)
+ MCFG_PIA6821_MODIFY("pia0", sys905_pia0_intf)
+ MCFG_PIA6821_MODIFY("pia1", sys905_pia1_intf)
/* sound hardware */
- MDRV_SOUND_MODIFY("ay8912")
- MDRV_SOUND_CONFIG(sys905_ay8912_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_MODIFY("ay8912")
+ MCFG_SOUND_CONFIG(sys905_ay8912_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_DEVICE_REMOVE("acia6850_0")
+ MCFG_DEVICE_REMOVE("acia6850_0")
MACHINE_CONFIG_END
@@ -2814,20 +2814,20 @@ static MACHINE_CONFIG_DERIVED( sys906, sys903 )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", M65C02, CPU_CLOCK) /* guess */
- MDRV_CPU_PROGRAM_MAP(sys906_map)
+ MCFG_CPU_REPLACE("maincpu", M65C02, CPU_CLOCK) /* guess */
+ MCFG_CPU_PROGRAM_MAP(sys906_map)
- MDRV_PIA6821_MODIFY("pia0", sys906_pia0_intf)
- MDRV_PIA6821_MODIFY("pia1", sys906_pia1_intf)
+ MCFG_PIA6821_MODIFY("pia0", sys906_pia0_intf)
+ MCFG_PIA6821_MODIFY("pia1", sys906_pia1_intf)
- MDRV_GFXDECODE(sys906)
+ MCFG_GFXDECODE(sys906)
/* sound hardware */
- MDRV_SOUND_MODIFY("ay8912")
- MDRV_SOUND_CONFIG(sys906_ay8912_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_MODIFY("ay8912")
+ MCFG_SOUND_CONFIG(sys906_ay8912_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_DEVICE_REMOVE("acia6850_0")
+ MCFG_DEVICE_REMOVE("acia6850_0")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index edd3d55ddb6..007048df775 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -432,43 +432,43 @@ static MACHINE_RESET( calorie )
static MACHINE_CONFIG_START( calorie, calorie_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(calorie_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(calorie_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,3000000) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(calorie_sound_map)
- MDRV_CPU_IO_MAP(calorie_sound_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 64)
+ MCFG_CPU_ADD("audiocpu", Z80,3000000) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(calorie_sound_map)
+ MCFG_CPU_IO_MAP(calorie_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 64)
- MDRV_MACHINE_START(calorie)
- MDRV_MACHINE_RESET(calorie)
+ MCFG_MACHINE_START(calorie)
+ MCFG_MACHINE_RESET(calorie)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_GFXDECODE(calorie)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(calorie)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(calorie)
- MDRV_VIDEO_UPDATE(calorie)
+ MCFG_VIDEO_START(calorie)
+ MCFG_VIDEO_UPDATE(calorie)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
- MDRV_SOUND_ADD("ay3", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
+ MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) /* YM2149 really */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 63fdd5bbc62..036aa11e902 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -237,33 +237,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( canyon, canyon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(22 * 1000000 / 15750))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(22 * 1000000 / 15750))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_GFXDECODE(canyon)
- MDRV_PALETTE_LENGTH(4)
+ MCFG_GFXDECODE(canyon)
+ MCFG_PALETTE_LENGTH(4)
- MDRV_PALETTE_INIT(canyon)
- MDRV_VIDEO_START(canyon)
- MDRV_VIDEO_UPDATE(canyon)
+ MCFG_PALETTE_INIT(canyon)
+ MCFG_VIDEO_START(canyon)
+ MCFG_VIDEO_UPDATE(canyon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(canyon)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(canyon)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index a5c2811b363..70aea9db47a 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -365,41 +365,41 @@ static MACHINE_RESET( capbowl )
static MACHINE_CONFIG_START( capbowl, capbowl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809E, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(capbowl_map)
- MDRV_CPU_VBLANK_INT("screen", capbowl_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809E, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(capbowl_map)
+ MCFG_CPU_VBLANK_INT("screen", capbowl_interrupt)
- MDRV_CPU_ADD("audiocpu", M6809E, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809E, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(capbowl)
- MDRV_MACHINE_RESET(capbowl)
- MDRV_NVRAM_ADD_CUSTOM("nvram", capbowl_state, init_nvram)
+ MCFG_MACHINE_START(capbowl)
+ MCFG_MACHINE_RESET(capbowl)
+ MCFG_NVRAM_ADD_CUSTOM("nvram", capbowl_state, init_nvram)
- MDRV_TICKET_DISPENSER_ADD("ticket", 100, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
+ MCFG_TICKET_DISPENSER_ADD("ticket", 100, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
/* video hardware */
- MDRV_VIDEO_START(capbowl)
- MDRV_VIDEO_UPDATE(capbowl)
+ MCFG_VIDEO_START(capbowl)
+ MCFG_VIDEO_UPDATE(capbowl)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(360, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 359, 0, 244)
- MDRV_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(360, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 359, 0, 244)
+ MCFG_SCREEN_REFRESH_RATE(57)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK/2)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.07)
- MDRV_SOUND_ROUTE(1, "mono", 0.07)
- MDRV_SOUND_ROUTE(2, "mono", 0.07)
- MDRV_SOUND_ROUTE(3, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK/2)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.07)
+ MCFG_SOUND_ROUTE(1, "mono", 0.07)
+ MCFG_SOUND_ROUTE(2, "mono", 0.07)
+ MCFG_SOUND_ROUTE(3, "mono", 0.75)
- 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
@@ -407,12 +407,12 @@ static MACHINE_CONFIG_DERIVED( bowlrama, capbowl )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bowlrama_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bowlrama_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 359, 0, 239)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 359, 0, 239)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index bc3d88aeb4c..104703fec30 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -195,33 +195,33 @@ static PALETTE_INIT(cardline)
static MACHINE_CONFIG_START( cardline, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I80C32,12000000)
- MDRV_CPU_PROGRAM_MAP(mem_prg)
- MDRV_CPU_IO_MAP(mem_io)
- //MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", I80C32,12000000)
+ MCFG_CPU_PROGRAM_MAP(mem_prg)
+ MCFG_CPU_IO_MAP(mem_io)
+ //MCFG_CPU_VBLANK_INT("screen", irq1_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(64*8, 35*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 35*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(cardline)
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(cardline)
+ MCFG_GFXDECODE(cardline)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(cardline)
- MDRV_VIDEO_UPDATE(cardline)
+ MCFG_VIDEO_UPDATE(cardline)
- MDRV_DEFAULT_LAYOUT(layout_cardline)
+ MCFG_DEFAULT_LAYOUT(layout_cardline)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1056000, 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("oki", 1056000, 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/carjmbre.c b/src/mame/drivers/carjmbre.c
index 8f3f950372b..66cfba1ad0d 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -192,40 +192,40 @@ static MACHINE_RESET( carjmbre )
static MACHINE_CONFIG_START( carjmbre, carjmbre_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(carjmbre_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_PROGRAM_MAP(carjmbre_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_RESET(carjmbre)
+ MCFG_MACHINE_RESET(carjmbre)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6/2)
- MDRV_CPU_PROGRAM_MAP(carjmbre_sound_map)
- MDRV_CPU_IO_MAP(carjmbre_sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6/2)
+ MCFG_CPU_PROGRAM_MAP(carjmbre_sound_map)
+ MCFG_CPU_IO_MAP(carjmbre_sound_io_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(2500)) /* not accurate */
- 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)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(carjmbre)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(carjmbre)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(carjmbre)
- MDRV_VIDEO_START(carjmbre)
- MDRV_VIDEO_UPDATE(carjmbre)
+ MCFG_PALETTE_INIT(carjmbre)
+ MCFG_VIDEO_START(carjmbre)
+ MCFG_VIDEO_UPDATE(carjmbre)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/6/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/6/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index ce9bd513f73..260d66a24a2 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -233,48 +233,48 @@ GFXDECODE_END
static MACHINE_CONFIG_START( carpolo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz/12) /* 940.75 kHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", carpolo_timer_interrupt) /* this not strictly VBLANK,
+ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz/12) /* 940.75 kHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", carpolo_timer_interrupt) /* this not strictly VBLANK,
but it's supposed to happen 60
times a sec, so it's a good place */
- MDRV_MACHINE_START(carpolo)
- MDRV_MACHINE_RESET(carpolo)
-
- MDRV_PIA6821_ADD("pia0", carpolo_pia0_intf)
- MDRV_PIA6821_ADD("pia1", carpolo_pia1_intf)
-
- MDRV_7474_ADD("7474_2s_1", "74148_3s", NULL, carpolo_7474_2s_1_q_cb)
- MDRV_7474_ADD("7474_2s_2", "74148_3s", NULL, carpolo_7474_2s_2_q_cb)
- MDRV_7474_ADD("7474_2u_1", "74148_3s", NULL, carpolo_7474_2u_1_q_cb)
- MDRV_7474_ADD("7474_2u_2", "74148_3s", NULL, carpolo_7474_2u_2_q_cb)
- MDRV_7474_ADD("7474_1f_1", NULL, NULL, NULL)
- MDRV_7474_ADD("7474_1f_2", NULL, NULL, NULL)
- MDRV_7474_ADD("7474_1d_1", NULL, NULL, NULL)
- MDRV_7474_ADD("7474_1d_2", NULL, NULL, NULL)
- MDRV_7474_ADD("7474_1c_1", NULL, NULL, NULL)
- MDRV_7474_ADD("7474_1c_2", NULL, NULL, NULL)
- MDRV_7474_ADD("7474_1a_1", NULL, NULL, NULL)
- MDRV_7474_ADD("7474_1a_2", NULL, NULL, NULL)
-
- MDRV_74148_ADD("74148_3s", carpolo_74148_3s_cb)
- MDRV_74153_ADD("74153_1k", NULL)
+ MCFG_MACHINE_START(carpolo)
+ MCFG_MACHINE_RESET(carpolo)
+
+ MCFG_PIA6821_ADD("pia0", carpolo_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", carpolo_pia1_intf)
+
+ MCFG_7474_ADD("7474_2s_1", "74148_3s", NULL, carpolo_7474_2s_1_q_cb)
+ MCFG_7474_ADD("7474_2s_2", "74148_3s", NULL, carpolo_7474_2s_2_q_cb)
+ MCFG_7474_ADD("7474_2u_1", "74148_3s", NULL, carpolo_7474_2u_1_q_cb)
+ MCFG_7474_ADD("7474_2u_2", "74148_3s", NULL, carpolo_7474_2u_2_q_cb)
+ MCFG_7474_ADD("7474_1f_1", NULL, NULL, NULL)
+ MCFG_7474_ADD("7474_1f_2", NULL, NULL, NULL)
+ MCFG_7474_ADD("7474_1d_1", NULL, NULL, NULL)
+ MCFG_7474_ADD("7474_1d_2", NULL, NULL, NULL)
+ MCFG_7474_ADD("7474_1c_1", NULL, NULL, NULL)
+ MCFG_7474_ADD("7474_1c_2", NULL, NULL, NULL)
+ MCFG_7474_ADD("7474_1a_1", NULL, NULL, NULL)
+ MCFG_7474_ADD("7474_1a_2", NULL, NULL, NULL)
+
+ MCFG_74148_ADD("74148_3s", carpolo_74148_3s_cb)
+ MCFG_74153_ADD("74153_1k", NULL)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 239, 0, 255)
-
- MDRV_GFXDECODE(carpolo)
- MDRV_PALETTE_LENGTH(12*2+2*16+4*2)
-
- MDRV_PALETTE_INIT(carpolo)
- MDRV_VIDEO_START(carpolo)
- MDRV_VIDEO_UPDATE(carpolo)
- MDRV_VIDEO_EOF(carpolo)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 239, 0, 255)
+
+ MCFG_GFXDECODE(carpolo)
+ MCFG_PALETTE_LENGTH(12*2+2*16+4*2)
+
+ MCFG_PALETTE_INIT(carpolo)
+ MCFG_VIDEO_START(carpolo)
+ MCFG_VIDEO_UPDATE(carpolo)
+ MCFG_VIDEO_EOF(carpolo)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 461e32f33d7..0ee58cf8e2e 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -315,33 +315,33 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( carrera, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 6)
- MDRV_CPU_PROGRAM_MAP(carrera_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 6)
+ MCFG_CPU_PROGRAM_MAP(carrera_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 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-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-1)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf)
- MDRV_GFXDECODE(carrera)
- MDRV_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(carrera)
+ MCFG_GFXDECODE(carrera)
+ MCFG_PALETTE_LENGTH(32)
+ MCFG_PALETTE_INIT(carrera)
- MDRV_VIDEO_UPDATE(carrera)
+ MCFG_VIDEO_UPDATE(carrera)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c
index ca5bc3623c3..771c95c5f68 100644
--- a/src/mame/drivers/caswin.c
+++ b/src/mame/drivers/caswin.c
@@ -277,33 +277,33 @@ static PALETTE_INIT( caswin )
static MACHINE_CONFIG_START( vvillage, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(vvillage_mem)
- MDRV_CPU_IO_MAP(vvillage_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold )
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(vvillage_mem)
+ MCFG_CPU_IO_MAP(vvillage_io)
+ 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_GFXDECODE(vvillage)
- MDRV_PALETTE_LENGTH(0x40)
- MDRV_PALETTE_INIT(caswin)
+ MCFG_GFXDECODE(vvillage)
+ MCFG_PALETTE_LENGTH(0x40)
+ MCFG_PALETTE_INIT(caswin)
- MDRV_VIDEO_START(vvillage)
- MDRV_VIDEO_UPDATE(vvillage)
+ MCFG_VIDEO_START(vvillage)
+ MCFG_VIDEO_UPDATE(vvillage)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 4000000 / 4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, 4000000 / 4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
ROM_START( caswin )
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 2a8db2f8dbb..ddd0adeb138 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -1851,36 +1851,36 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( dfeveron, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(dfeveron_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(dfeveron_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(dfeveron)
- MDRV_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
- MDRV_PALETTE_INIT(dfeveron)
+ MCFG_GFXDECODE(dfeveron)
+ MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
+ MCFG_PALETTE_INIT(dfeveron)
- MDRV_VIDEO_START(cave_2_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_2_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1892,36 +1892,36 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ddonpach, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(ddonpach_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(ddonpach_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(ddonpach)
- MDRV_PALETTE_LENGTH(0x8000 + 0x40*16) // $400 extra entries for layers 1&2
- MDRV_PALETTE_INIT(ddonpach)
+ MCFG_GFXDECODE(ddonpach)
+ MCFG_PALETTE_LENGTH(0x8000 + 0x40*16) // $400 extra entries for layers 1&2
+ MCFG_PALETTE_INIT(ddonpach)
- MDRV_VIDEO_START(cave_3_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_3_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1937,41 +1937,41 @@ static const nmk112_interface donpachi_nmk112_intf =
static MACHINE_CONFIG_START( donpachi, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(donpachi_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(donpachi_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(donpachi)
- MDRV_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
- MDRV_PALETTE_INIT(dfeveron)
+ MCFG_GFXDECODE(donpachi)
+ MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
+ MCFG_PALETTE_INIT(dfeveron)
- MDRV_VIDEO_START(cave_3_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_3_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.60)
+ MCFG_OKIM6295_ADD("oki1", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.60)
- 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)
- MDRV_NMK112_ADD("nmk112", donpachi_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", donpachi_nmk112_intf)
MACHINE_CONFIG_END
@@ -1982,36 +1982,36 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( esprade, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(esprade_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(esprade_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(esprade)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(cave)
+ MCFG_GFXDECODE(esprade)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_INIT(cave)
- MDRV_VIDEO_START(cave_3_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_3_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2022,35 +2022,35 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gaia, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(gaia_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(gaia_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(esprade)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(cave)
+ MCFG_GFXDECODE(esprade)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_INIT(cave)
- MDRV_VIDEO_START(cave_3_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_3_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2061,36 +2061,36 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( guwange, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(guwange_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(guwange_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(esprade)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(cave)
+ MCFG_GFXDECODE(esprade)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_INIT(cave)
- MDRV_VIDEO_START(cave_3_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_3_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -2100,50 +2100,50 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hotdogst, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(hotdogst_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(hotdogst_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(hotdogst_sound_map)
- MDRV_CPU_IO_MAP(hotdogst_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz)
+ MCFG_CPU_PROGRAM_MAP(hotdogst_sound_map)
+ MCFG_CPU_IO_MAP(hotdogst_sound_portmap)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 240-1)
- MDRV_GFXDECODE(hotdogst)
- MDRV_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
- MDRV_PALETTE_INIT(dfeveron)
+ MCFG_GFXDECODE(hotdogst)
+ MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
+ MCFG_PALETTE_INIT(dfeveron)
- MDRV_VIDEO_START(cave_3_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_3_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.80)
-
- MDRV_OKIM6295_ADD("oki", XTAL_1_056MHz, 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_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.80)
+
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, 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
@@ -2154,43 +2154,43 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( korokoro, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(korokoro_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(korokoro_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit)
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C46_8bit)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1-2, 0, 240-1-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1-2, 0, 240-1-1)
- MDRV_GFXDECODE(korokoro)
- MDRV_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
- MDRV_PALETTE_INIT(korokoro)
+ MCFG_GFXDECODE(korokoro)
+ MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
+ MCFG_PALETTE_INIT(korokoro)
- MDRV_VIDEO_START(cave_1_layer)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_1_layer)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( crusherm, korokoro )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(crusherm_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(crusherm_map)
MACHINE_CONFIG_END
@@ -2201,52 +2201,52 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mazinger, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(mazinger_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(mazinger_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_4MHz) // Bidirectional communication
- MDRV_CPU_PROGRAM_MAP(mazinger_sound_map)
- MDRV_CPU_IO_MAP(mazinger_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) // Bidirectional communication
+ MCFG_CPU_PROGRAM_MAP(mazinger_sound_map)
+ MCFG_CPU_IO_MAP(mazinger_sound_portmap)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 240-1)
- MDRV_GFXDECODE(mazinger)
- MDRV_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
- MDRV_PALETTE_INIT(mazinger)
+ MCFG_GFXDECODE(mazinger)
+ MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
+ MCFG_PALETTE_INIT(mazinger)
- MDRV_VIDEO_START(cave_2_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_2_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.60)
-
- MDRV_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_4MHz)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.60)
+
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.0)
MACHINE_CONFIG_END
@@ -2257,50 +2257,50 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( metmqstr, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
- MDRV_CPU_PROGRAM_MAP(metmqstr_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(metmqstr_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz / 4)
- MDRV_CPU_PROGRAM_MAP(metmqstr_sound_map)
- MDRV_CPU_IO_MAP(metmqstr_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz / 4)
+ MCFG_CPU_PROGRAM_MAP(metmqstr_sound_map)
+ MCFG_CPU_IO_MAP(metmqstr_sound_portmap)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave) /* start with the watchdog armed */
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave) /* start with the watchdog armed */
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(0x200, 240)
- MDRV_SCREEN_VISIBLE_AREA(0x7d, 0x7d + 0x180-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(0x200, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0x7d, 0x7d + 0x180-1, 0, 240-1)
- MDRV_GFXDECODE(donpachi)
- MDRV_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
- MDRV_PALETTE_INIT(dfeveron)
+ MCFG_GFXDECODE(donpachi)
+ MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
+ MCFG_PALETTE_INIT(dfeveron)
- MDRV_VIDEO_START(cave_3_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_3_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz / 4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.20)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz / 4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.20)
- MDRV_OKIM6295_ADD("oki1", XTAL_32MHz / 16 , OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", XTAL_32MHz / 16 , OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", XTAL_32MHz / 16 , OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki2", XTAL_32MHz / 16 , OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2310,45 +2310,45 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pacslot, cave_state )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
- MDRV_CPU_PROGRAM_MAP(pacslot_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(pacslot_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_ADD("eeprom", eeprom_interface_93C46_pacslot)
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C46_pacslot)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(0x200, 240)
- MDRV_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(0x200, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1)
- MDRV_GFXDECODE(tjumpman)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(cave)
+ MCFG_GFXDECODE(tjumpman)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_INIT(cave)
- MDRV_VIDEO_START(cave_1_layer)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_1_layer)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", XTAL_28MHz / 28, 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", XTAL_28MHz / 28, 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)
// oki2 chip is present but its rom socket is unpopulated
- MDRV_OKIM6295_ADD("oki2", XTAL_28MHz / 28, 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", XTAL_28MHz / 28, 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
@@ -2367,56 +2367,56 @@ static const nmk112_interface pwrinst2_nmk112_intf =
static MACHINE_CONFIG_START( pwrinst2, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(pwrinst2_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(pwrinst2_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_16MHz / 2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(pwrinst2_sound_map)
- MDRV_CPU_IO_MAP(pwrinst2_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_16MHz / 2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(pwrinst2_sound_map)
+ MCFG_CPU_IO_MAP(pwrinst2_sound_portmap)
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(0x200, 240)
- MDRV_SCREEN_VISIBLE_AREA(0x70, 0x70 + 0x140-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(0x200, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0x70, 0x70 + 0x140-1, 0, 240-1)
- MDRV_GFXDECODE(pwrinst2)
- MDRV_PALETTE_LENGTH(0x8000+0x2800)
- MDRV_PALETTE_INIT(pwrinst2)
+ MCFG_GFXDECODE(pwrinst2)
+ MCFG_PALETTE_LENGTH(0x8000+0x2800)
+ MCFG_PALETTE_INIT(pwrinst2)
- MDRV_VIDEO_START(cave_4_layers)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_4_layers)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.40)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.40)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.80)
-
- MDRV_OKIM6295_ADD("oki1", XTAL_3MHz , OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
-
- MDRV_OKIM6295_ADD("oki2", XTAL_3MHz , OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
-
- MDRV_NMK112_ADD("nmk112", pwrinst2_nmk112_intf)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.40)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.80)
+
+ MCFG_OKIM6295_ADD("oki1", XTAL_3MHz , OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+
+ MCFG_OKIM6295_ADD("oki2", XTAL_3MHz , OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
+
+ MCFG_NMK112_ADD("nmk112", pwrinst2_nmk112_intf)
MACHINE_CONFIG_END
@@ -2427,49 +2427,49 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sailormn, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(sailormn_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(sailormn_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz) // Bidirectional Communication
- MDRV_CPU_PROGRAM_MAP(sailormn_sound_map)
- MDRV_CPU_IO_MAP(sailormn_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz) // Bidirectional Communication
+ MCFG_CPU_PROGRAM_MAP(sailormn_sound_map)
+ MCFG_CPU_IO_MAP(sailormn_sound_portmap)
-// MDRV_QUANTUM_TIME(HZ(600))
+// MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320+1, 240)
- MDRV_SCREEN_VISIBLE_AREA(0+1, 320+1-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320+1, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0+1, 320+1-1, 0, 240-1)
- MDRV_GFXDECODE(sailormn)
- MDRV_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
- MDRV_PALETTE_INIT(sailormn) // 4 bit sprites, 6 bit tiles
+ MCFG_GFXDECODE(sailormn)
+ MCFG_PALETTE_LENGTH(0x8000) /* $8000 palette entries for consistency with the other games */
+ MCFG_PALETTE_INIT(sailormn) // 4 bit sprites, 6 bit tiles
- MDRV_VIDEO_START(sailormn_3_layers) /* Layer 2 has 1 banked ROM */
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(sailormn_3_layers) /* Layer 2 has 1 banked ROM */
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
-
- 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)
-
- 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_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
+
+ 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)
+
+ 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
@@ -2479,40 +2479,40 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tjumpman, cave_state )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
- MDRV_CPU_PROGRAM_MAP(tjumpman_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(tjumpman_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
- MDRV_MACHINE_START(cave)
- MDRV_MACHINE_RESET(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_MACHINE_RESET(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(0x200, 240)
- MDRV_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(0x200, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x140-1, 0, 240-1)
- MDRV_GFXDECODE(tjumpman)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(cave)
+ MCFG_GFXDECODE(tjumpman)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_INIT(cave)
- MDRV_VIDEO_START(cave_1_layer)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_VIDEO_START(cave_1_layer)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", XTAL_28MHz / 28, 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", XTAL_28MHz / 28, 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)
// oki2 chip spot and rom socket are both unpopulated
MACHINE_CONFIG_END
@@ -2525,35 +2525,35 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( uopoko, cave_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(uopoko_map)
- MDRV_CPU_VBLANK_INT("screen", cave_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(uopoko_map)
+ MCFG_CPU_VBLANK_INT("screen", cave_interrupt)
- MDRV_MACHINE_START(cave)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(cave)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(15625/271.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(15625/271.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(uopoko)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(uopoko)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(cave)
- MDRV_VIDEO_START(cave_1_layer)
- MDRV_VIDEO_UPDATE(cave)
+ MCFG_PALETTE_INIT(cave)
+ MCFG_VIDEO_START(cave_1_layer)
+ MCFG_VIDEO_UPDATE(cave)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c
index b42e7f79c97..c5b05c25a69 100644
--- a/src/mame/drivers/cb2001.c
+++ b/src/mame/drivers/cb2001.c
@@ -792,36 +792,36 @@ static const ay8910_interface cb2001_ay8910_config =
static const nec_config cb2001_config = { cb2001_decryption_table, };
static MACHINE_CONFIG_START( cb2001, driver_device )
- MDRV_CPU_ADD("maincpu", V35, 20000000) // CPU91A-011-0016JK004; encrypted cpu like nec v25/35 used in some irem game
- MDRV_CPU_CONFIG(cb2001_config)
- MDRV_CPU_PROGRAM_MAP(cb2001_map)
- MDRV_CPU_IO_MAP(cb2001_io)
- MDRV_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_ADD("maincpu", V35, 20000000) // CPU91A-011-0016JK004; encrypted cpu like nec v25/35 used in some irem game
+ MCFG_CPU_CONFIG(cb2001_config)
+ MCFG_CPU_PROGRAM_MAP(cb2001_map)
+ MCFG_CPU_IO_MAP(cb2001_io)
+ MCFG_CPU_VBLANK_INT("screen", vblank_irq)
- MDRV_PPI8255_ADD( "ppi8255_0", cb2001_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cb2001_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cb2001_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cb2001_ppi8255_intf[1] )
- MDRV_GFXDECODE(cb2001)
+ MCFG_GFXDECODE(cb2001)
- MDRV_PALETTE_INIT( cb2001 )
+ MCFG_PALETTE_INIT( cb2001 )
- 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(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 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_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(cb2001)
- MDRV_VIDEO_UPDATE(cb2001)
+ MCFG_VIDEO_START(cb2001)
+ MCFG_VIDEO_UPDATE(cb2001)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000) // wrong
- MDRV_SOUND_CONFIG(cb2001_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000) // wrong
+ MCFG_SOUND_CONFIG(cb2001_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index 8cd88fa6bad..71a8abff1eb 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -226,25 +226,25 @@ GFXDECODE_END
static MACHINE_CONFIG_START( cball, cball_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) /* ? */
- MDRV_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) /* ? */
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
- MDRV_MACHINE_START(cball)
- MDRV_MACHINE_RESET(cball)
+ MCFG_MACHINE_START(cball)
+ MCFG_MACHINE_RESET(cball)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 223)
-
- MDRV_GFXDECODE(cball)
- MDRV_PALETTE_LENGTH(6)
-
- MDRV_PALETTE_INIT(cball)
- MDRV_VIDEO_START(cball)
- MDRV_VIDEO_UPDATE(cball)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 223)
+
+ MCFG_GFXDECODE(cball)
+ MCFG_PALETTE_LENGTH(6)
+
+ MCFG_PALETTE_INIT(cball)
+ MCFG_VIDEO_START(cball)
+ MCFG_VIDEO_UPDATE(cball)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index c1740637d65..c8209556394 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -279,40 +279,40 @@ static MACHINE_RESET( cbasebal )
static MACHINE_CONFIG_START( cbasebal, cbasebal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 6000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(cbasebal_map)
- MDRV_CPU_IO_MAP(cbasebal_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
+ MCFG_CPU_ADD("maincpu", Z80, 6000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(cbasebal_map)
+ MCFG_CPU_IO_MAP(cbasebal_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
- MDRV_MACHINE_START(cbasebal)
- MDRV_MACHINE_RESET(cbasebal)
+ MCFG_MACHINE_START(cbasebal)
+ MCFG_MACHINE_RESET(cbasebal)
- MDRV_EEPROM_ADD("eeprom", cbasebal_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", cbasebal_eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- 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(8*8, (64-8)*8-1, 2*8, 30*8-1 )
+ 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(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(cbasebal)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(cbasebal)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(cbasebal)
- MDRV_VIDEO_UPDATE(cbasebal)
+ MCFG_VIDEO_START(cbasebal)
+ MCFG_VIDEO_UPDATE(cbasebal)
/* 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", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 2e4d0c7f530..cf853753481 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -316,49 +316,49 @@ static MACHINE_RESET( cbuster )
static MACHINE_CONFIG_START( twocrude, cbuster_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59 */
- MDRV_CPU_PROGRAM_MAP(twocrude_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59 */
+ MCFG_CPU_PROGRAM_MAP(twocrude_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(cbuster)
- MDRV_MACHINE_RESET(cbuster)
+ MCFG_MACHINE_START(cbuster)
+ MCFG_MACHINE_RESET(cbuster)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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)
- MDRV_GFXDECODE(cbuster)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(cbuster)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(twocrude)
+ MCFG_VIDEO_UPDATE(twocrude)
- MDRV_DECO16IC_ADD("deco_custom", twocrude_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", twocrude_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ym1", YM2203, 32220000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ym2", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index e6565459f8c..9289c6a5f55 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -481,36 +481,36 @@ static const pokey_interface pokey_config =
static MACHINE_CONFIG_START( ccastles, ccastles_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(ccastles)
- MDRV_MACHINE_RESET(ccastles)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_START(ccastles)
+ MCFG_MACHINE_RESET(ccastles)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
- MDRV_X2212_ADD_AUTOSAVE("nvram_4b")
- MDRV_X2212_ADD_AUTOSAVE("nvram_4a")
+ MCFG_X2212_ADD_AUTOSAVE("nvram_4b")
+ MCFG_X2212_ADD_AUTOSAVE("nvram_4a")
/* video hardware */
- MDRV_GFXDECODE(ccastles)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(ccastles)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, HTOTAL - 1, VTOTAL, 0, VTOTAL - 1) /* will be adjusted later */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, HTOTAL - 1, VTOTAL, 0, VTOTAL - 1) /* will be adjusted later */
- MDRV_VIDEO_START(ccastles)
- MDRV_VIDEO_UPDATE(ccastles)
+ MCFG_VIDEO_START(ccastles)
+ MCFG_VIDEO_UPDATE(ccastles)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c
index c6cf2bf3449..bafa541e697 100644
--- a/src/mame/drivers/cchance.c
+++ b/src/mame/drivers/cchance.c
@@ -204,34 +204,34 @@ static MACHINE_RESET( cchance )
static MACHINE_CONFIG_START( cchance, tnzs_state )
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(cchance)
- MDRV_MACHINE_RESET(cchance)
+ MCFG_MACHINE_START(cchance)
+ MCFG_MACHINE_RESET(cchance)
- MDRV_GFXDECODE(cchance)
+ MCFG_GFXDECODE(cchance)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.5)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.5)
+ 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)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(arknoid2)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_PALETTE_INIT(arknoid2)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
ROM_START( cchance )
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index 465ebe71e4b..55a91582248 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -156,44 +156,44 @@ static const z80_daisy_config daisy_chain[] =
static MACHINE_CONFIG_START( cchasm, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */
- MDRV_CPU_PROGRAM_MAP(memmap)
+ MCFG_CPU_ADD("maincpu", M68000,CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */
+ MCFG_CPU_PROGRAM_MAP(memmap)
- MDRV_CPU_ADD("audiocpu", Z80,3584229) /* 3.58 MHz (from schematics) */
- MDRV_CPU_CONFIG(daisy_chain)
- MDRV_CPU_PROGRAM_MAP(sound_memmap)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80,3584229) /* 3.58 MHz (from schematics) */
+ MCFG_CPU_CONFIG(daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_Z80CTC_ADD("ctc", 3584229 /* same as "audiocpu" */, cchasm_ctc_intf)
+ MCFG_Z80CTC_ADD("ctc", 3584229 /* same as "audiocpu" */, cchasm_ctc_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(40)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 768-1)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(40)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 768-1)
- MDRV_VIDEO_START(cchasm)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(cchasm)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SOUND_START(cchasm)
+ MCFG_SOUND_START(cchasm)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1818182)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("ay1", AY8910, 1818182)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ay2", AY8910, 1818182)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("ay2", AY8910, 1818182)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* 6840 PTM */
- MDRV_PTM6840_ADD("6840ptm", cchasm_6840_intf)
+ MCFG_PTM6840_ADD("6840ptm", cchasm_6840_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index 75306c36f7b..fe53b7d3505 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -984,133 +984,133 @@ GFXDECODE_END
static MACHINE_CONFIG_START( root, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(cclimber_map)
- MDRV_CPU_IO_MAP(cclimber_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(cclimber_map)
+ MCFG_CPU_IO_MAP(cclimber_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_RESET(cclimber)
+ MCFG_MACHINE_RESET(cclimber)
/* 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(cclimber)
- MDRV_PALETTE_LENGTH(16*4+8*4)
-
- MDRV_PALETTE_INIT(cclimber)
- MDRV_VIDEO_START(cclimber)
- MDRV_VIDEO_UPDATE(cclimber)
+ 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(cclimber)
+ MCFG_PALETTE_LENGTH(16*4+8*4)
+
+ MCFG_PALETTE_INIT(cclimber)
+ MCFG_VIDEO_START(cclimber)
+ MCFG_VIDEO_UPDATE(cclimber)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cclimber, root )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/3/2/2)
- MDRV_SOUND_CONFIG(cclimber_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/3/2/2)
+ MCFG_SOUND_CONFIG(cclimber_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(cclimber_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(cclimber_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cannonb, cclimber )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cannonb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cannonb_map)
/* video hardware */
- MDRV_GFXDECODE(cannonb)
+ MCFG_GFXDECODE(cannonb)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yamato, root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yamato_map)
- MDRV_CPU_IO_MAP(yamato_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(yamato_map)
+ MCFG_CPU_IO_MAP(yamato_portmap)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz ? */
- MDRV_CPU_PROGRAM_MAP(yamato_audio_map)
- MDRV_CPU_IO_MAP(yamato_audio_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(yamato_audio_map)
+ MCFG_CPU_IO_MAP(yamato_audio_portmap)
/* video hardware */
- MDRV_PALETTE_LENGTH(16*4+8*4+256)
- MDRV_PALETTE_INIT(yamato)
- MDRV_VIDEO_UPDATE(yamato)
+ MCFG_PALETTE_LENGTH(16*4+8*4+256)
+ MCFG_PALETTE_INIT(yamato)
+ MCFG_VIDEO_UPDATE(yamato)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1536000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1536000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1536000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1536000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( toprollr, cclimber )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(toprollr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(toprollr_map)
/* video hardware */
- MDRV_GFXDECODE(toprollr)
- MDRV_PALETTE_LENGTH(32*5)
- MDRV_PALETTE_INIT(toprollr)
+ MCFG_GFXDECODE(toprollr)
+ MCFG_PALETTE_LENGTH(32*5)
+ MCFG_PALETTE_INIT(toprollr)
- MDRV_VIDEO_START(toprollr)
- MDRV_VIDEO_UPDATE(toprollr)
+ MCFG_VIDEO_START(toprollr)
+ MCFG_VIDEO_UPDATE(toprollr)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( swimmer, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(swimmer_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(swimmer_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_4MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(swimmer_audio_map)
- MDRV_CPU_IO_MAP(swimmer_audio_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_4MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(swimmer_audio_map)
+ MCFG_CPU_IO_MAP(swimmer_audio_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.57) /* verified on pcb */
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.57) /* verified on pcb */
+ 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)
- MDRV_GFXDECODE(swimmer)
- MDRV_PALETTE_LENGTH(32*8+4*8+1)
+ MCFG_GFXDECODE(swimmer)
+ MCFG_PALETTE_LENGTH(32*8+4*8+1)
- MDRV_PALETTE_INIT(swimmer)
- MDRV_VIDEO_START(swimmer)
- MDRV_VIDEO_UPDATE(swimmer)
+ MCFG_PALETTE_INIT(swimmer)
+ MCFG_VIDEO_START(swimmer)
+ MCFG_VIDEO_UPDATE(swimmer)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_4MHz/2) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_4MHz/2) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_4MHz/2) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_4MHz/2) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c
index 1a60210e92c..831efe760bd 100644
--- a/src/mame/drivers/cdi.c
+++ b/src/mame/drivers/cdi.c
@@ -266,74 +266,74 @@ static MACHINE_RESET( quizrr42 )
static MACHINE_CONFIG_START( cdi, cdi_state )
- MDRV_CPU_ADD("maincpu", SCC68070, CLOCK_A/2)
- MDRV_CPU_PROGRAM_MAP(cdimono1_mem)
- MDRV_CPU_VBLANK_INT("screen", scc68070_mcu_frame)
+ MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2)
+ MCFG_CPU_PROGRAM_MAP(cdimono1_mem)
+ MCFG_CPU_VBLANK_INT("screen", scc68070_mcu_frame)
- 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(384, 302)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 22, 302-1) //dynamic resolution,TODO
+ 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(384, 302)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 22, 302-1) //dynamic resolution,TODO
- MDRV_SCREEN_ADD("lcd", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(192, 22)
- MDRV_SCREEN_VISIBLE_AREA(0, 192-1, 0, 22-1)
+ MCFG_SCREEN_ADD("lcd", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(192, 22)
+ MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 22-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_DEFAULT_LAYOUT(layout_cdi)
+ MCFG_DEFAULT_LAYOUT(layout_cdi)
- MDRV_VIDEO_START(cdimono1)
- MDRV_VIDEO_UPDATE(cdimono1)
+ MCFG_VIDEO_START(cdimono1)
+ MCFG_VIDEO_UPDATE(cdimono1)
- MDRV_MACHINE_START(cdi)
+ MCFG_MACHINE_START(cdi)
- MDRV_CDICDIC_ADD( "cdic" )
- MDRV_CDISLAVE_ADD( "slave" )
+ MCFG_CDICDIC_ADD( "cdic" )
+ MCFG_CDISLAVE_ADD( "slave" )
/* sound hardware */
- 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 )
+ 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 )
- MDRV_SOUND_ADD( "cdda", CDDA, 0 )
- MDRV_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
- MDRV_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
+ MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
+ MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
- MDRV_MK48T08_ADD( "mk48t08" )
+ MCFG_MK48T08_ADD( "mk48t08" )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizrd12, cdi )
- MDRV_MACHINE_RESET( quizrd12 )
+ MCFG_MACHINE_RESET( quizrd12 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizrd17, cdi )
- MDRV_MACHINE_RESET( quizrd17 )
+ MCFG_MACHINE_RESET( quizrd17 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizrd22, cdi )
- MDRV_MACHINE_RESET( quizrd22 )
+ MCFG_MACHINE_RESET( quizrd22 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizrd32, cdi )
- MDRV_MACHINE_RESET( quizrd32 )
+ MCFG_MACHINE_RESET( quizrd32 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizrr41, cdi )
- MDRV_MACHINE_RESET( quizrr41 )
+ MCFG_MACHINE_RESET( quizrr41 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizrr42, cdi )
- MDRV_MACHINE_RESET( quizrr42 )
+ MCFG_MACHINE_RESET( quizrr42 )
MACHINE_CONFIG_END
/*************************
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index 65cb981afaa..dd5bea4c6fc 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -1593,35 +1593,35 @@ static const pokey_interface warlords_pokey_interface =
static MACHINE_CONFIG_START( centiped, centiped_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */
- MDRV_CPU_PROGRAM_MAP(centiped_map)
+ MCFG_CPU_ADD("maincpu", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */
+ MCFG_CPU_PROGRAM_MAP(centiped_map)
- MDRV_MACHINE_START(centiped)
- MDRV_MACHINE_RESET(centiped)
+ MCFG_MACHINE_START(centiped)
+ MCFG_MACHINE_RESET(centiped)
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
/* timer */
- MDRV_TIMER_ADD_SCANLINE("32v", generate_interrupt, "screen", 0, 16)
+ MCFG_TIMER_ADD_SCANLINE("32v", generate_interrupt, "screen", 0, 16)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(centiped)
- MDRV_PALETTE_LENGTH(4+4*4*4*4)
+ MCFG_GFXDECODE(centiped)
+ MCFG_PALETTE_LENGTH(4+4*4*4*4)
- MDRV_VIDEO_START(centiped)
- MDRV_VIDEO_UPDATE(centiped)
+ MCFG_VIDEO_START(centiped)
+ MCFG_VIDEO_UPDATE(centiped)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey", POKEY, 12096000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("pokey", POKEY, 12096000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1630,117 +1630,117 @@ static MACHINE_CONFIG_DERIVED( caterplr, centiped )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_REPLACE("pokey", AY8910, 12096000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_REPLACE("pokey", AY8910, 12096000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( centipdb, centiped )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(centipdb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(centipdb_map)
/* sound hardware */
- MDRV_SOUND_REPLACE("pokey", AY8910, 12096000/8)
- MDRV_SOUND_CONFIG(centipdb_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_REPLACE("pokey", AY8910, 12096000/8)
+ MCFG_SOUND_CONFIG(centipdb_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( magworm, centiped )
/* basic machine hardware */
- MDRV_MACHINE_RESET(magworm)
+ MCFG_MACHINE_RESET(magworm)
/* sound hardware */
- MDRV_SOUND_REPLACE("pokey", AY8910, 12096000/8)
- MDRV_SOUND_CONFIG(centipdb_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_REPLACE("pokey", AY8910, 12096000/8)
+ MCFG_SOUND_CONFIG(centipdb_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( milliped, centiped )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(milliped_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(milliped_map)
/* video hardware */
- MDRV_GFXDECODE(milliped)
- MDRV_PALETTE_LENGTH(4*4+4*4*4*4*4)
+ MCFG_GFXDECODE(milliped)
+ MCFG_PALETTE_LENGTH(4*4+4*4*4*4*4)
- MDRV_VIDEO_START(milliped)
- MDRV_VIDEO_UPDATE(milliped)
+ MCFG_VIDEO_START(milliped)
+ MCFG_VIDEO_UPDATE(milliped)
/* sound hardware */
- MDRV_SOUND_REPLACE("pokey", POKEY, 12096000/8)
- MDRV_SOUND_CONFIG(milliped_pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_REPLACE("pokey", POKEY, 12096000/8)
+ MCFG_SOUND_CONFIG(milliped_pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, 12096000/8)
- MDRV_SOUND_CONFIG(milliped_pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, 12096000/8)
+ MCFG_SOUND_CONFIG(milliped_pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( warlords, centiped )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(warlords_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(warlords_map)
/* video hardware */
- MDRV_GFXDECODE(warlords)
- MDRV_PALETTE_LENGTH(8*4+8*4)
+ MCFG_GFXDECODE(warlords)
+ MCFG_PALETTE_LENGTH(8*4+8*4)
- MDRV_PALETTE_INIT(warlords)
- MDRV_VIDEO_START(warlords)
- MDRV_VIDEO_UPDATE(warlords)
+ MCFG_PALETTE_INIT(warlords)
+ MCFG_VIDEO_START(warlords)
+ MCFG_VIDEO_UPDATE(warlords)
/* sound hardware */
- MDRV_SOUND_REPLACE("pokey", POKEY, 12096000/8)
- MDRV_SOUND_CONFIG(warlords_pokey_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("pokey", POKEY, 12096000/8)
+ MCFG_SOUND_CONFIG(warlords_pokey_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mazeinv, milliped )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mazeinv_map)
- MDRV_VIDEO_UPDATE(centiped)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mazeinv_map)
+ MCFG_VIDEO_UPDATE(centiped)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bullsdrt, centiped_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, 12096000/8)
- MDRV_CPU_PROGRAM_MAP(bullsdrt_map)
- MDRV_CPU_IO_MAP(bullsdrt_port_map)
+ MCFG_CPU_ADD("maincpu", S2650, 12096000/8)
+ MCFG_CPU_PROGRAM_MAP(bullsdrt_map)
+ MCFG_CPU_IO_MAP(bullsdrt_port_map)
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(centiped)
- MDRV_PALETTE_LENGTH(4+4*4*4*4)
+ MCFG_GFXDECODE(centiped)
+ MCFG_PALETTE_LENGTH(4+4*4*4*4)
- MDRV_VIDEO_START(bullsdrt)
- MDRV_VIDEO_UPDATE(bullsdrt)
+ MCFG_VIDEO_START(bullsdrt)
+ MCFG_VIDEO_UPDATE(bullsdrt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76496, 12096000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76496, 12096000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 5c551402896..8a817156056 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -273,38 +273,38 @@ static MACHINE_RESET( chaknpop )
static MACHINE_CONFIG_START( chaknpop, chaknpop_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18MHz / 6) /* Verified on PCB */
- MDRV_CPU_PROGRAM_MAP(chaknpop_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz / 6) /* Verified on PCB */
+ MCFG_CPU_PROGRAM_MAP(chaknpop_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(chaknpop)
- MDRV_MACHINE_RESET(chaknpop)
+ MCFG_MACHINE_START(chaknpop)
+ MCFG_MACHINE_RESET(chaknpop)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ 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)
- MDRV_GFXDECODE(chaknpop)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(chaknpop)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(chaknpop)
- MDRV_VIDEO_START(chaknpop)
- MDRV_VIDEO_UPDATE(chaknpop)
+ MCFG_PALETTE_INIT(chaknpop)
+ MCFG_VIDEO_START(chaknpop)
+ MCFG_VIDEO_UPDATE(chaknpop)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_18MHz / 12) /* Verified on PCB */
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_18MHz / 12) /* Verified on PCB */
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_18MHz / 12) /* Verified on PCB */
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_18MHz / 12) /* Verified on PCB */
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index 35c4b7fe4ea..04602d1b982 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -311,37 +311,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( cham24, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", N2A03, N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(cham24_map)
+ MCFG_CPU_ADD("maincpu", N2A03, N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(cham24_map)
- MDRV_MACHINE_RESET( cham24 )
- MDRV_MACHINE_START( cham24 )
+ MCFG_MACHINE_RESET( cham24 )
+ MCFG_MACHINE_START( cham24 )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(cham24)
- MDRV_PALETTE_LENGTH(8*4*16)
+ MCFG_GFXDECODE(cham24)
+ MCFG_PALETTE_LENGTH(8*4*16)
- MDRV_PALETTE_INIT(cham24)
- MDRV_VIDEO_START(cham24)
- MDRV_VIDEO_UPDATE(cham24)
+ MCFG_PALETTE_INIT(cham24)
+ MCFG_VIDEO_START(cham24)
+ MCFG_VIDEO_UPDATE(cham24)
- MDRV_PPU2C04_ADD("ppu", ppu_interface)
+ MCFG_PPU2C04_ADD("ppu", ppu_interface)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
- MDRV_SOUND_CONFIG(cham24_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(cham24_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- 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
ROM_START( cham24 )
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index c1660e38d82..4821df65b5f 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -600,36 +600,36 @@ static MACHINE_RESET( champbas )
static MACHINE_CONFIG_START( talbot, champbas_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(talbot_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_PROGRAM_MAP(talbot_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
/* MCU */
- MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_MACHINE_START(champbas)
- MDRV_MACHINE_RESET(champbas)
+ MCFG_MACHINE_START(champbas)
+ MCFG_MACHINE_RESET(champbas)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(talbot)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(talbot)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(champbas)
- MDRV_VIDEO_START(champbas)
- MDRV_VIDEO_UPDATE(champbas)
- MDRV_VIDEO_EOF(champbas)
+ MCFG_PALETTE_INIT(champbas)
+ MCFG_VIDEO_START(champbas)
+ MCFG_VIDEO_UPDATE(champbas)
+ MCFG_VIDEO_EOF(champbas)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -637,39 +637,39 @@ static MACHINE_CONFIG_START( champbas, champbas_state )
/* basic machine hardware */
/* main cpu */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(champbas_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_PROGRAM_MAP(champbas_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(champbas_sub_map)
+ MCFG_CPU_ADD("sub", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_PROGRAM_MAP(champbas_sub_map)
- MDRV_MACHINE_START(champbas)
- MDRV_MACHINE_RESET(champbas)
+ MCFG_MACHINE_START(champbas)
+ MCFG_MACHINE_RESET(champbas)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ 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)
- MDRV_GFXDECODE(champbas)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(champbas)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(champbas)
- MDRV_VIDEO_START(champbas)
- MDRV_VIDEO_UPDATE(champbas)
- MDRV_VIDEO_EOF(champbas)
+ MCFG_PALETTE_INIT(champbas)
+ MCFG_VIDEO_START(champbas)
+ MCFG_VIDEO_UPDATE(champbas)
+ MCFG_VIDEO_EOF(champbas)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -678,108 +678,108 @@ static MACHINE_CONFIG_DERIVED( champmcu, champbas )
/* basic machine hardware */
/* MCU */
- MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD(CPUTAG_MCU, ALPHA8201, XTAL_18_432MHz/6/8)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
/* to MCU timeout champbbj */
- MDRV_QUANTUM_TIME(HZ(3000))
+ MCFG_QUANTUM_TIME(HZ(3000))
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( exctsccr, champbas_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6 )
- MDRV_CPU_PROGRAM_MAP(exctsccr_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6 )
+ MCFG_CPU_PROGRAM_MAP(exctsccr_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4 )
- MDRV_CPU_PROGRAM_MAP(exctsccr_sub_map)
- MDRV_CPU_IO_MAP(exctsccr_sound_io_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000) /* 4 kHz, updates the dac */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4 )
+ MCFG_CPU_PROGRAM_MAP(exctsccr_sub_map)
+ MCFG_CPU_IO_MAP(exctsccr_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 4000) /* 4 kHz, updates the dac */
/* MCU */
- MDRV_CPU_ADD(CPUTAG_MCU, ALPHA8301, XTAL_18_432MHz/6/8) /* Actually 8302 */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD(CPUTAG_MCU, ALPHA8301, XTAL_18_432MHz/6/8) /* Actually 8302 */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_MACHINE_START(exctsccr)
- MDRV_MACHINE_RESET(champbas)
+ MCFG_MACHINE_START(exctsccr)
+ MCFG_MACHINE_RESET(champbas)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.54)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.54)
+ 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)
- MDRV_GFXDECODE(exctsccr)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(exctsccr)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(exctsccr)
- MDRV_VIDEO_START(exctsccr)
- MDRV_VIDEO_UPDATE(exctsccr)
- MDRV_VIDEO_EOF(champbas)
+ MCFG_PALETTE_INIT(exctsccr)
+ MCFG_VIDEO_START(exctsccr)
+ MCFG_VIDEO_UPDATE(exctsccr)
+ MCFG_VIDEO_EOF(champbas)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* AY (melody) clock is specified by a VR (0.9 - 3.9 MHz) */
- MDRV_SOUND_ADD("ay1", AY8910, 1940000) /* VR has a factory mark and this is the value read */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
+ MCFG_SOUND_ADD("ay1", AY8910, 1940000) /* VR has a factory mark and this is the value read */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_14_31818MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD("ay3", AY8910, XTAL_14_31818MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD("ay4", AY8910, XTAL_14_31818MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
+ MCFG_SOUND_ADD("ay4", AY8910, XTAL_14_31818MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/* Bootleg running on a modified Champion Baseball board */
static MACHINE_CONFIG_START( exctsccrb, champbas_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(exctsccrb_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_PROGRAM_MAP(exctsccrb_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6)
- MDRV_CPU_PROGRAM_MAP(champbas_sub_map)
+ MCFG_CPU_ADD("sub", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_PROGRAM_MAP(champbas_sub_map)
- MDRV_MACHINE_START(champbas)
- MDRV_MACHINE_RESET(champbas)
+ MCFG_MACHINE_START(champbas)
+ MCFG_MACHINE_RESET(champbas)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ 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)
- MDRV_GFXDECODE(exctsccr)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(exctsccr)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(exctsccr)
- MDRV_VIDEO_START(exctsccr)
- MDRV_VIDEO_UPDATE(exctsccr)
- MDRV_VIDEO_EOF(champbas)
+ MCFG_PALETTE_INIT(exctsccr)
+ MCFG_VIDEO_START(exctsccr)
+ MCFG_VIDEO_UPDATE(exctsccr)
+ MCFG_VIDEO_EOF(champbas)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index cf33063bc61..e0725c62f6c 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -358,37 +358,37 @@ static MACHINE_RESET( champbwl )
static MACHINE_CONFIG_START( champbwl, tnzs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 16000000/4) /* 4MHz */
- MDRV_CPU_PROGRAM_MAP(champbwl_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 16000000/4) /* 4MHz */
+ MCFG_CPU_PROGRAM_MAP(champbwl_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(champbwl)
- MDRV_MACHINE_RESET(champbwl)
+ MCFG_MACHINE_START(champbwl)
+ MCFG_MACHINE_RESET(champbwl)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.5)
- 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, 48*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.5)
+ 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, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(champbwl)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(champbwl)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(arknoid2)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_PALETTE_INIT(arknoid2)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000)
- MDRV_SOUND_CONFIG(champbwl_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
+ MCFG_SOUND_CONFIG(champbwl_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
ROM_START( champbwl )
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index ab83b283e22..25dd54eb1ab 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -384,32 +384,32 @@ static MACHINE_RESET( chanbara )
static MACHINE_CONFIG_START( chanbara, chanbara_state )
- MDRV_CPU_ADD("maincpu", M6809, 12000000/8)
- MDRV_CPU_PROGRAM_MAP(memmap)
+ MCFG_CPU_ADD("maincpu", M6809, 12000000/8)
+ MCFG_CPU_PROGRAM_MAP(memmap)
- MDRV_MACHINE_START(chanbara)
- MDRV_MACHINE_RESET(chanbara)
+ MCFG_MACHINE_START(chanbara)
+ MCFG_MACHINE_RESET(chanbara)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.4122)
- 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(0, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.4122)
+ 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(0, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(chanbara)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(chanbara)
+ MCFG_GFXDECODE(chanbara)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(chanbara)
- MDRV_VIDEO_START(chanbara)
- MDRV_VIDEO_UPDATE(chanbara)
+ MCFG_VIDEO_START(chanbara)
+ MCFG_VIDEO_UPDATE(chanbara)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 12000000/8)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 12000000/8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index 3d5337435dd..572539d479e 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -522,36 +522,36 @@ static MACHINE_RESET (changela)
static MACHINE_CONFIG_START( changela, changela_state )
- MDRV_CPU_ADD("maincpu", Z80,5000000)
- MDRV_CPU_PROGRAM_MAP(changela_map)
- MDRV_CPU_VBLANK_INT_HACK(chl_interrupt,4)
+ MCFG_CPU_ADD("maincpu", Z80,5000000)
+ MCFG_CPU_PROGRAM_MAP(changela_map)
+ MCFG_CPU_VBLANK_INT_HACK(chl_interrupt,4)
- MDRV_CPU_ADD("mcu", M68705,2500000)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", M68705,2500000)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_MACHINE_START(changela)
- MDRV_MACHINE_RESET(changela)
+ MCFG_MACHINE_START(changela)
+ MCFG_MACHINE_RESET(changela)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 262) /* vert size is a guess */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 262) /* vert size is a guess */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x40)
+ MCFG_PALETTE_LENGTH(0x40)
- MDRV_VIDEO_START(changela)
- MDRV_VIDEO_UPDATE(changela)
+ MCFG_VIDEO_START(changela)
+ MCFG_VIDEO_UPDATE(changela)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index 138cdefca7f..e24ed5e1530 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -120,33 +120,33 @@ static MACHINE_START( cheekyms )
static MACHINE_CONFIG_START( cheekyms, cheekyms_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,5000000/2) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,5000000/2) /* 2.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(cheekyms)
+ MCFG_MACHINE_START(cheekyms)
/* 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, 4*8, 28*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, 32*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(cheekyms)
- MDRV_PALETTE_LENGTH(0xc0)
+ MCFG_GFXDECODE(cheekyms)
+ MCFG_PALETTE_LENGTH(0xc0)
- MDRV_PALETTE_INIT(cheekyms)
- MDRV_VIDEO_START(cheekyms)
- MDRV_VIDEO_UPDATE(cheekyms)
+ MCFG_PALETTE_INIT(cheekyms)
+ MCFG_VIDEO_START(cheekyms)
+ MCFG_VIDEO_UPDATE(cheekyms)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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/chihiro.c b/src/mame/drivers/chihiro.c
index 8225151be28..cbbfcd41a66 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -301,36 +301,36 @@ static MACHINE_START( chihiro )
static MACHINE_CONFIG_START( chihiro_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PENTIUM, 733333333) /* Wrong! */
- MDRV_CPU_PROGRAM_MAP(xbox_map)
- MDRV_CPU_IO_MAP(xbox_map_io)
-
- MDRV_QUANTUM_TIME(HZ(6000))
-
- MDRV_PCI_BUS_ADD("pcibus", 0)
- MDRV_PCI_BUS_DEVICE(0, "PCI Bridge Device - Host Bridge", dummy_pci_r, dummy_pci_w)
- MDRV_PCI_BUS_DEVICE(1, "HUB Interface - ISA Bridge", dummy_pci_r, dummy_pci_w)
- MDRV_PCI_BUS_DEVICE(2, "OHCI USB Controller 1", dummy_pci_r, dummy_pci_w)
- MDRV_PCI_BUS_DEVICE(3, "OHCI USB Controller 2", dummy_pci_r, dummy_pci_w)
- MDRV_PCI_BUS_DEVICE(30, "AGP Host to PCI Bridge", dummy_pci_r, dummy_pci_w)
- MDRV_PCI_BUS_ADD("agpbus", 1)
- MDRV_PCI_BUS_SIBLING("pcibus")
- MDRV_PCI_BUS_DEVICE(0, "NV2A GeForce 3MX Integrated GPU/Northbridge", dummy_pci_r, dummy_pci_w)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 733333333) /* Wrong! */
+ MCFG_CPU_PROGRAM_MAP(xbox_map)
+ MCFG_CPU_IO_MAP(xbox_map_io)
+
+ MCFG_QUANTUM_TIME(HZ(6000))
+
+ MCFG_PCI_BUS_ADD("pcibus", 0)
+ MCFG_PCI_BUS_DEVICE(0, "PCI Bridge Device - Host Bridge", dummy_pci_r, dummy_pci_w)
+ MCFG_PCI_BUS_DEVICE(1, "HUB Interface - ISA Bridge", dummy_pci_r, dummy_pci_w)
+ MCFG_PCI_BUS_DEVICE(2, "OHCI USB Controller 1", dummy_pci_r, dummy_pci_w)
+ MCFG_PCI_BUS_DEVICE(3, "OHCI USB Controller 2", dummy_pci_r, dummy_pci_w)
+ MCFG_PCI_BUS_DEVICE(30, "AGP Host to PCI Bridge", dummy_pci_r, dummy_pci_w)
+ MCFG_PCI_BUS_ADD("agpbus", 1)
+ MCFG_PCI_BUS_SIBLING("pcibus")
+ MCFG_PCI_BUS_DEVICE(0, "NV2A GeForce 3MX Integrated GPU/Northbridge", dummy_pci_r, dummy_pci_w)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_MACHINE_START(chihiro)
+ MCFG_MACHINE_START(chihiro)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( chihirogd, chihiro_base )
- MDRV_NAOMI_DIMM_BOARD_ADD("rom_board", "gdrom", "user1", "picreturn")
+ MCFG_NAOMI_DIMM_BOARD_ADD("rom_board", "gdrom", "user1", "picreturn")
MACHINE_CONFIG_END
#define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 12f1027324a..0d430fa08ce 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -571,134 +571,134 @@ static MACHINE_RESET( chinagat )
static MACHINE_CONFIG_START( chinagat, ddragon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("sub", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
- MDRV_MACHINE_START(chinagat)
- MDRV_MACHINE_RESET(chinagat)
+ MCFG_MACHINE_START(chinagat)
+ MCFG_MACHINE_RESET(chinagat)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */
- MDRV_GFXDECODE(chinagat)
- MDRV_PALETTE_LENGTH(384)
+ MCFG_GFXDECODE(chinagat)
+ MCFG_PALETTE_LENGTH(384)
- MDRV_VIDEO_START(chinagat)
- MDRV_VIDEO_UPDATE(ddragon)
+ MCFG_VIDEO_START(chinagat)
+ MCFG_VIDEO_UPDATE(ddragon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.80)
- MDRV_SOUND_ROUTE(1, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.80)
+ MCFG_SOUND_ROUTE(1, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", 1065000, OKIM6295_PIN7_HIGH) // pin 7 not verified, clock frequency estimated with recording
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1065000, OKIM6295_PIN7_HIGH) // pin 7 not verified, clock frequency estimated with recording
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( saiyugoub1, ddragon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */
- MDRV_CPU_PROGRAM_MAP(saiyugoub1_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */
+ MCFG_CPU_PROGRAM_MAP(saiyugoub1_sound_map)
- MDRV_CPU_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */
- MDRV_CPU_PROGRAM_MAP(i8748_map)
- MDRV_CPU_IO_MAP(i8748_portmap)
+ MCFG_CPU_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */
+ MCFG_CPU_PROGRAM_MAP(i8748_map)
+ MCFG_CPU_IO_MAP(i8748_portmap)
- MDRV_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
- MDRV_MACHINE_START(chinagat)
- MDRV_MACHINE_RESET(chinagat)
+ MCFG_MACHINE_START(chinagat)
+ MCFG_MACHINE_RESET(chinagat)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */
- MDRV_GFXDECODE(chinagat)
- MDRV_PALETTE_LENGTH(384)
+ MCFG_GFXDECODE(chinagat)
+ MCFG_PALETTE_LENGTH(384)
- MDRV_VIDEO_START(chinagat)
- MDRV_VIDEO_UPDATE(ddragon)
+ MCFG_VIDEO_START(chinagat)
+ MCFG_VIDEO_UPDATE(ddragon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.80)
- MDRV_SOUND_ROUTE(1, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.80)
+ MCFG_SOUND_ROUTE(1, "mono", 0.80)
- MDRV_SOUND_ADD("adpcm", MSM5205, 9263750 / 24)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("adpcm", MSM5205, 9263750 / 24)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( saiyugoub2, ddragon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", chinagat_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */
- MDRV_CPU_PROGRAM_MAP(ym2203c_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz oscillator */
+ MCFG_CPU_PROGRAM_MAP(ym2203c_sound_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
- MDRV_MACHINE_START(chinagat)
- MDRV_MACHINE_RESET(chinagat)
+ MCFG_MACHINE_START(chinagat)
+ MCFG_MACHINE_RESET(chinagat)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240) /* based on ddragon driver */
- MDRV_GFXDECODE(chinagat)
- MDRV_PALETTE_LENGTH(384)
+ MCFG_GFXDECODE(chinagat)
+ MCFG_PALETTE_LENGTH(384)
- MDRV_VIDEO_START(chinagat)
- MDRV_VIDEO_UPDATE(ddragon)
+ MCFG_VIDEO_START(chinagat)
+ MCFG_VIDEO_UPDATE(ddragon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 3579545)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
-
- MDRV_SOUND_ADD("ym2", YM2203, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 3579545)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index e0d9405151a..b7c915cc4da 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -592,42 +592,42 @@ static MACHINE_RESET( chinsan )
static MACHINE_CONFIG_START( chinsan, chinsan_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,10000000/2) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(chinsan_map)
- MDRV_CPU_IO_MAP(chinsan_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(chinsan_map)
+ MCFG_CPU_IO_MAP(chinsan_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START( chinsan )
- MDRV_MACHINE_RESET( chinsan )
+ MCFG_MACHINE_START( chinsan )
+ MCFG_MACHINE_RESET( chinsan )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_VISIBLE_AREA(24, 512-24-1, 16, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_VISIBLE_AREA(24, 512-24-1, 16, 256-16-1)
- MDRV_GFXDECODE(chinsan)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(chinsan)
+ MCFG_GFXDECODE(chinsan)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(chinsan)
- MDRV_VIDEO_START(chinsan)
- MDRV_VIDEO_UPDATE(chinsan)
+ MCFG_VIDEO_START(chinsan)
+ MCFG_VIDEO_UPDATE(chinsan)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) /* ? Mhz */
- MDRV_SOUND_CONFIG(ym2203_config)
- 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("adpcm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000) /* ? Mhz */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ 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("adpcm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 3990169d87d..ac59edaf8a1 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -388,57 +388,57 @@ static MACHINE_RESET( chqflag )
static MACHINE_CONFIG_START( chqflag, chqflag_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(chqflag_map)
- MDRV_CPU_VBLANK_INT_HACK(chqflag_interrupt,16) /* ? */
+ MCFG_CPU_ADD("maincpu", KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */
+ MCFG_CPU_PROGRAM_MAP(chqflag_map)
+ MCFG_CPU_VBLANK_INT_HACK(chqflag_interrupt,16) /* ? */
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(chqflag_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(chqflag_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(chqflag)
- MDRV_MACHINE_RESET(chqflag)
+ MCFG_MACHINE_START(chqflag)
+ MCFG_MACHINE_RESET(chqflag)
/* 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(12*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(12*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(chqflag)
- MDRV_VIDEO_UPDATE(chqflag)
+ MCFG_VIDEO_START(chqflag)
+ MCFG_VIDEO_UPDATE(chqflag)
- MDRV_K051960_ADD("k051960", chqflag_k051960_intf)
- MDRV_K051316_ADD("k051316_1", chqflag_k051316_intf_1)
- MDRV_K051316_ADD("k051316_2", chqflag_k051316_intf_2)
- MDRV_K051733_ADD("k051733")
+ MCFG_K051960_ADD("k051960", chqflag_k051960_intf)
+ MCFG_K051316_ADD("k051316_1", chqflag_k051316_intf_1)
+ MCFG_K051316_ADD("k051316_2", chqflag_k051316_intf_2)
+ MCFG_K051733_ADD("k051733")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
-
- MDRV_SOUND_ADD("k007232_1", K007232, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(k007232_interface_1)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
-
- MDRV_SOUND_ADD("k007232_2", K007232, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(k007232_interface_2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
+
+ MCFG_SOUND_ADD("k007232_1", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(k007232_interface_1)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
+
+ MCFG_SOUND_ADD("k007232_2", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(k007232_interface_2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
MACHINE_CONFIG_END
ROM_START( chqflag )
diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c
index 02a9927f841..fc3efc2c082 100644
--- a/src/mame/drivers/chsuper.c
+++ b/src/mame/drivers/chsuper.c
@@ -193,32 +193,32 @@ GFXDECODE_END
static MACHINE_CONFIG_START( chsuper, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(chsuper_prg_map)
- MDRV_CPU_IO_MAP(chsuper_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
+ MCFG_CPU_PROGRAM_MAP(chsuper_prg_map)
+ MCFG_CPU_IO_MAP(chsuper_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- 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, 48*8-1, 0, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ 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, 48*8-1, 0, 30*8-1)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_GFXDECODE(chsuper)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(chsuper)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(chsuper)
- MDRV_VIDEO_UPDATE(chsuper)
+ MCFG_VIDEO_START(chsuper)
+ MCFG_VIDEO_UPDATE(chsuper)
/* 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.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index d99229589be..7302b5cfaf1 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -478,75 +478,75 @@ void cidelsa_state::machine_reset()
static MACHINE_CONFIG_START( destryer, cidelsa_state )
/* basic system hardware */
- MDRV_CPU_ADD(CDP1802_TAG, COSMAC, DESTRYER_CHR1)
- MDRV_CPU_PROGRAM_MAP(destryer_map)
- MDRV_CPU_IO_MAP(destryer_io_map)
- MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_CPU_ADD(CDP1802_TAG, COSMAC, DESTRYER_CHR1)
+ MCFG_CPU_PROGRAM_MAP(destryer_map)
+ MCFG_CPU_IO_MAP(destryer_io_map)
+ MCFG_CPU_CONFIG(cidelsa_cdp1802_config)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(cidelsa)
+ MCFG_MACHINE_START(cidelsa)
/* sound and video hardware */
- MDRV_FRAGMENT_ADD(destryer_video)
+ MCFG_FRAGMENT_ADD(destryer_video)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( destryera, cidelsa_state )
/* basic system hardware */
- MDRV_CPU_ADD(CDP1802_TAG, COSMAC, DESTRYER_CHR1)
- MDRV_CPU_PROGRAM_MAP(destryera_map)
- MDRV_CPU_IO_MAP(destryer_io_map)
- MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_CPU_ADD(CDP1802_TAG, COSMAC, DESTRYER_CHR1)
+ MCFG_CPU_PROGRAM_MAP(destryera_map)
+ MCFG_CPU_IO_MAP(destryer_io_map)
+ MCFG_CPU_CONFIG(cidelsa_cdp1802_config)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(cidelsa)
+ MCFG_MACHINE_START(cidelsa)
/* sound and video hardware */
- MDRV_FRAGMENT_ADD(destryer_video)
+ MCFG_FRAGMENT_ADD(destryer_video)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( altair, cidelsa_state )
/* basic system hardware */
- MDRV_CPU_ADD(CDP1802_TAG, COSMAC, ALTAIR_CHR1)
- MDRV_CPU_PROGRAM_MAP(altair_map)
- MDRV_CPU_IO_MAP(altair_io_map)
- MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_CPU_ADD(CDP1802_TAG, COSMAC, ALTAIR_CHR1)
+ MCFG_CPU_PROGRAM_MAP(altair_map)
+ MCFG_CPU_IO_MAP(altair_io_map)
+ MCFG_CPU_CONFIG(cidelsa_cdp1802_config)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(cidelsa)
+ MCFG_MACHINE_START(cidelsa)
/* input/output hardware */
- MDRV_CDP1852_ADD("ic23", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in0_intf) /* clock is really tied to CDP1869 CMSEL (pin 37) */
- MDRV_CDP1852_ADD("ic24", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in1_intf)
- MDRV_CDP1852_ADD("ic25", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in2_intf)
- MDRV_CDP1852_ADD("ic26", ALTAIR_CHR1 / 8, altair_cdp1852_out1_intf) /* clock is CDP1802 TPB */
+ MCFG_CDP1852_ADD("ic23", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in0_intf) /* clock is really tied to CDP1869 CMSEL (pin 37) */
+ MCFG_CDP1852_ADD("ic24", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in1_intf)
+ MCFG_CDP1852_ADD("ic25", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in2_intf)
+ MCFG_CDP1852_ADD("ic26", ALTAIR_CHR1 / 8, altair_cdp1852_out1_intf) /* clock is CDP1802 TPB */
/* sound and video hardware */
- MDRV_FRAGMENT_ADD(altair_video)
+ MCFG_FRAGMENT_ADD(altair_video)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( draco, cidelsa_state )
/* basic system hardware */
- MDRV_CPU_ADD(CDP1802_TAG, COSMAC, DRACO_CHR1)
- MDRV_CPU_PROGRAM_MAP(draco_map)
- MDRV_CPU_IO_MAP(draco_io_map)
- MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_CPU_ADD(CDP1802_TAG, COSMAC, DRACO_CHR1)
+ MCFG_CPU_PROGRAM_MAP(draco_map)
+ MCFG_CPU_IO_MAP(draco_io_map)
+ MCFG_CPU_CONFIG(cidelsa_cdp1802_config)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(draco)
+ MCFG_MACHINE_START(draco)
- MDRV_CPU_ADD(COP402N_TAG, COP402, DRACO_SND_CHR1)
- MDRV_CPU_PROGRAM_MAP(draco_sound_map)
- MDRV_CPU_IO_MAP(draco_sound_io_map)
- MDRV_CPU_CONFIG(draco_cop_intf)
+ MCFG_CPU_ADD(COP402N_TAG, COP402, DRACO_SND_CHR1)
+ MCFG_CPU_PROGRAM_MAP(draco_sound_map)
+ MCFG_CPU_IO_MAP(draco_sound_io_map)
+ MCFG_CPU_CONFIG(draco_cop_intf)
/* input/output hardware */
- MDRV_CDP1852_ADD("ic29", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in0_intf) /* clock is really tied to CDP1876 CMSEL (pin 32) */
- MDRV_CDP1852_ADD("ic30", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in1_intf)
- MDRV_CDP1852_ADD("ic31", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in2_intf)
- MDRV_CDP1852_ADD("ic32", DRACO_CHR1 / 8, draco_cdp1852_out1_intf) /* clock is CDP1802 TPB */
+ MCFG_CDP1852_ADD("ic29", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in0_intf) /* clock is really tied to CDP1876 CMSEL (pin 32) */
+ MCFG_CDP1852_ADD("ic30", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in1_intf)
+ MCFG_CDP1852_ADD("ic31", CDP1852_CLOCK_HIGH, cidelsa_cdp1852_in2_intf)
+ MCFG_CDP1852_ADD("ic32", DRACO_CHR1 / 8, draco_cdp1852_out1_intf) /* clock is CDP1802 TPB */
/* sound and video hardware */
- MDRV_FRAGMENT_ADD(draco_video)
+ MCFG_FRAGMENT_ADD(draco_video)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index 6202e019e6f..8b3f93cccdf 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -995,55 +995,55 @@ static const ccpu_config config_jmi =
static MACHINE_CONFIG_START( cinemat_nojmi_4k, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", CCPU, MASTER_CLOCK/4)
- MDRV_CPU_CONFIG(config_nojmi)
- MDRV_CPU_PROGRAM_MAP(program_map_4k)
- MDRV_CPU_DATA_MAP(data_map)
- MDRV_CPU_IO_MAP(io_map)
+ MCFG_CPU_ADD("maincpu", CCPU, MASTER_CLOCK/4)
+ MCFG_CPU_CONFIG(config_nojmi)
+ MCFG_CPU_PROGRAM_MAP(program_map_4k)
+ MCFG_CPU_DATA_MAP(data_map)
+ MCFG_CPU_IO_MAP(io_map)
- MDRV_MACHINE_START(cinemat)
- MDRV_MACHINE_RESET(cinemat)
+ MCFG_MACHINE_START(cinemat)
+ MCFG_MACHINE_RESET(cinemat)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(MASTER_CLOCK/4/16/16/16/16/2)
- MDRV_SCREEN_SIZE(1024, 768)
- MDRV_SCREEN_VISIBLE_AREA(0, 1023, 0, 767)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(MASTER_CLOCK/4/16/16/16/16/2)
+ MCFG_SCREEN_SIZE(1024, 768)
+ MCFG_SCREEN_VISIBLE_AREA(0, 1023, 0, 767)
- MDRV_VIDEO_START(cinemat_bilevel)
- MDRV_VIDEO_UPDATE(cinemat)
+ MCFG_VIDEO_START(cinemat_bilevel)
+ MCFG_VIDEO_UPDATE(cinemat)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cinemat_jmi_4k, cinemat_nojmi_4k )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(config_jmi)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(config_jmi)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cinemat_nojmi_8k, cinemat_nojmi_4k )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(program_map_8k)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(program_map_8k)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cinemat_jmi_8k, cinemat_jmi_4k )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(program_map_8k)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(program_map_8k)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cinemat_jmi_16k, cinemat_jmi_4k )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(program_map_16k)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(program_map_16k)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cinemat_jmi_32k, cinemat_jmi_4k )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(program_map_32k)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(program_map_32k)
MACHINE_CONFIG_END
@@ -1056,98 +1056,98 @@ MACHINE_CONFIG_END
*************************************/
static MACHINE_CONFIG_DERIVED( spacewar, cinemat_nojmi_4k )
- MDRV_FRAGMENT_ADD(spacewar_sound)
- MDRV_VIDEO_UPDATE(spacewar)
+ MCFG_FRAGMENT_ADD(spacewar_sound)
+ MCFG_VIDEO_UPDATE(spacewar)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( barrier, cinemat_jmi_4k )
- MDRV_FRAGMENT_ADD(barrier_sound)
+ MCFG_FRAGMENT_ADD(barrier_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( speedfrk, cinemat_nojmi_8k )
- MDRV_FRAGMENT_ADD(speedfrk_sound)
+ MCFG_FRAGMENT_ADD(speedfrk_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( starhawk, cinemat_jmi_4k )
- MDRV_FRAGMENT_ADD(starhawk_sound)
+ MCFG_FRAGMENT_ADD(starhawk_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sundance, cinemat_jmi_8k )
- MDRV_FRAGMENT_ADD(sundance_sound)
- MDRV_VIDEO_START(cinemat_16level)
+ MCFG_FRAGMENT_ADD(sundance_sound)
+ MCFG_VIDEO_START(cinemat_16level)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tailg, cinemat_nojmi_8k )
- MDRV_FRAGMENT_ADD(tailg_sound)
+ MCFG_FRAGMENT_ADD(tailg_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( warrior, cinemat_jmi_8k )
- MDRV_FRAGMENT_ADD(warrior_sound)
+ MCFG_FRAGMENT_ADD(warrior_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( armora, cinemat_jmi_16k )
- MDRV_FRAGMENT_ADD(armora_sound)
+ MCFG_FRAGMENT_ADD(armora_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ripoff, cinemat_jmi_8k )
- MDRV_FRAGMENT_ADD(ripoff_sound)
+ MCFG_FRAGMENT_ADD(ripoff_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( starcas, cinemat_jmi_8k )
- MDRV_FRAGMENT_ADD(starcas_sound)
+ MCFG_FRAGMENT_ADD(starcas_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( solarq, cinemat_jmi_16k )
- MDRV_FRAGMENT_ADD(solarq_sound)
- MDRV_VIDEO_START(cinemat_64level)
+ MCFG_FRAGMENT_ADD(solarq_sound)
+ MCFG_VIDEO_START(cinemat_64level)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( boxingb, cinemat_jmi_32k )
- MDRV_FRAGMENT_ADD(boxingb_sound)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 1024, 0, 788)
- MDRV_VIDEO_START(cinemat_color)
+ MCFG_FRAGMENT_ADD(boxingb_sound)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 1024, 0, 788)
+ MCFG_VIDEO_START(cinemat_color)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wotw, cinemat_jmi_16k )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 1120, 0, 767)
- MDRV_FRAGMENT_ADD(wotw_sound)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 1120, 0, 767)
+ MCFG_FRAGMENT_ADD(wotw_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wotwc, cinemat_jmi_16k )
- MDRV_FRAGMENT_ADD(wotwc_sound)
- MDRV_VIDEO_START(cinemat_color)
+ MCFG_FRAGMENT_ADD(wotwc_sound)
+ MCFG_VIDEO_START(cinemat_color)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( demon, cinemat_jmi_16k )
- MDRV_FRAGMENT_ADD(demon_sound)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 1024, 0, 805)
+ MCFG_FRAGMENT_ADD(demon_sound)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 1024, 0, 805)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qb3, cinemat_jmi_32k )
- MDRV_FRAGMENT_ADD(qb3_sound)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_DATA_MAP(data_map_qb3)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 1120, 0, 780)
- MDRV_VIDEO_START(cinemat_qb3color)
+ MCFG_FRAGMENT_ADD(qb3_sound)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_DATA_MAP(data_map_qb3)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 1120, 0, 780)
+ MCFG_VIDEO_START(cinemat_qb3color)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index a3c794c068c..bc0a6af15b7 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -290,152 +290,152 @@ static MACHINE_RESET( circus )
static MACHINE_CONFIG_START( circus, circus_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
- MDRV_CPU_PROGRAM_MAP(circus_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
+ MCFG_CPU_PROGRAM_MAP(circus_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(circus)
- MDRV_MACHINE_RESET(circus)
+ MCFG_MACHINE_START(circus)
+ MCFG_MACHINE_RESET(circus)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3500) /* frames per second, vblank duration (complete guess) */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3500) /* frames per second, vblank duration (complete guess) */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(circus)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(circus)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(circus)
- MDRV_VIDEO_UPDATE(circus)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(circus)
+ MCFG_VIDEO_UPDATE(circus)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(circus_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(circus_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(circus)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(circus)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( robotbwl, circus_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
/* driver data */
- MDRV_CPU_PROGRAM_MAP(circus_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_PROGRAM_MAP(circus_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(circus)
- MDRV_MACHINE_RESET(circus)
+ MCFG_MACHINE_START(circus)
+ MCFG_MACHINE_RESET(circus)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3500) /* frames per second, vblank duration (complete guess) */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3500) /* frames per second, vblank duration (complete guess) */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(robotbwl)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(robotbwl)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(circus)
- MDRV_VIDEO_UPDATE(robotbwl)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(circus)
+ MCFG_VIDEO_UPDATE(robotbwl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(robotbwl_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(robotbwl_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(robotbwl)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(robotbwl)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( crash, circus_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
- MDRV_CPU_PROGRAM_MAP(circus_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
+ MCFG_CPU_PROGRAM_MAP(circus_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_MACHINE_START(circus)
- MDRV_MACHINE_RESET(circus)
+ MCFG_MACHINE_START(circus)
+ MCFG_MACHINE_RESET(circus)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3500) /* frames per second, vblank duration (complete guess) */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3500) /* frames per second, vblank duration (complete guess) */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(circus)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(circus)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(circus)
- MDRV_VIDEO_UPDATE(crash)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(circus)
+ MCFG_VIDEO_UPDATE(crash)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(crash_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(crash_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(crash)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(crash)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ripcord, circus_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
- MDRV_CPU_PROGRAM_MAP(circus_map)
- //MDRV_CPU_VBLANK_INT("screen", ripcord_interrupt) //AT
+ MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
+ MCFG_CPU_PROGRAM_MAP(circus_map)
+ //MCFG_CPU_VBLANK_INT("screen", ripcord_interrupt) //AT
- MDRV_MACHINE_START(circus)
- MDRV_MACHINE_RESET(circus)
+ MCFG_MACHINE_START(circus)
+ MCFG_MACHINE_RESET(circus)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3500) /* frames per second, vblank duration (complete guess) */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3500) /* frames per second, vblank duration (complete guess) */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(circus)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(circus)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(circus)
- MDRV_VIDEO_UPDATE(ripcord)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(circus)
+ MCFG_VIDEO_UPDATE(ripcord)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(ripcord_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(ripcord_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(circus)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(circus)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index 4c973113f00..50aabb72d7c 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -334,48 +334,48 @@ DISCRETE_SOUND_END
static MACHINE_CONFIG_START( circusc, circusc_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2048000) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(circusc_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_CPU_ADD("maincpu", M6809, 2048000) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(circusc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
- MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* Z80 Clock is derived from a 14.31818 MHz crystal */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* Z80 Clock is derived from a 14.31818 MHz crystal */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(circusc)
- MDRV_MACHINE_RESET(circusc)
+ MCFG_MACHINE_START(circusc)
+ MCFG_MACHINE_RESET(circusc)
/* 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)
+ 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)
- MDRV_GFXDECODE(circusc)
- MDRV_PALETTE_LENGTH(16*16+16*16)
+ MCFG_GFXDECODE(circusc)
+ MCFG_PALETTE_LENGTH(16*16+16*16)
- MDRV_PALETTE_INIT(circusc)
- MDRV_VIDEO_START(circusc)
- MDRV_VIDEO_UPDATE(circusc)
+ MCFG_PALETTE_INIT(circusc)
+ MCFG_VIDEO_START(circusc)
+ MCFG_VIDEO_UPDATE(circusc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 14318180/8)
- MDRV_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 0)
+ MCFG_SOUND_ADD("sn1", SN76496, 14318180/8)
+ MCFG_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 0)
- MDRV_SOUND_ADD("sn2", SN76496, 14318180/8)
- MDRV_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 1)
+ MCFG_SOUND_ADD("sn2", SN76496, 14318180/8)
+ MCFG_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 1)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 2)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 2)
- MDRV_SOUND_ADD("fltdisc", DISCRETE, 0)
+ MCFG_SOUND_ADD("fltdisc", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(circusc)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_CONFIG_DISCRETE(circusc)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index c9537aa49c7..151f2f50037 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -1568,106 +1568,106 @@ static INTERRUPT_GEN( cischeat_interrupt )
static MACHINE_CONFIG_START( bigrun, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu1", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(bigrun_map)
- MDRV_CPU_VBLANK_INT_HACK(cischeat_interrupt,CISCHEAT_INTERRUPT_NUM)
+ MCFG_CPU_ADD("cpu1", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(bigrun_map)
+ MCFG_CPU_VBLANK_INT_HACK(cischeat_interrupt,CISCHEAT_INTERRUPT_NUM)
- MDRV_CPU_ADD("cpu2", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(bigrun_map2)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("cpu2", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(bigrun_map2)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("cpu3", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(bigrun_map3)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("cpu3", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(bigrun_map3)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("soundcpu", M68000, 6000000)
- MDRV_CPU_PROGRAM_MAP(bigrun_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq4_line_hold,CISCHEAT_SOUND_INTERRUPT_NUM)
+ MCFG_CPU_ADD("soundcpu", M68000, 6000000)
+ MCFG_CPU_PROGRAM_MAP(bigrun_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq4_line_hold,CISCHEAT_SOUND_INTERRUPT_NUM)
- MDRV_QUANTUM_TIME(HZ(1200))
+ MCFG_QUANTUM_TIME(HZ(1200))
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(bigrun)
- MDRV_PALETTE_LENGTH(16*16 * 3 + 64*16 * 2 + 64*16) /* scroll 0,1,2; road 0,1; sprites */
+ MCFG_GFXDECODE(bigrun)
+ MCFG_PALETTE_LENGTH(16*16 * 3 + 64*16 * 2 + 64*16) /* scroll 0,1,2; road 0,1; sprites */
- MDRV_VIDEO_START(bigrun)
- MDRV_VIDEO_UPDATE(bigrun)
+ MCFG_VIDEO_START(bigrun)
+ MCFG_VIDEO_UPDATE(bigrun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, STD_FM_CLOCK)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2151, STD_FM_CLOCK)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_OKIM6295_ADD("oki1", STD_OKI_CLOCK, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", STD_OKI_CLOCK, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", STD_OKI_CLOCK, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki2", STD_OKI_CLOCK, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cischeat, bigrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(cischeat_map)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_PROGRAM_MAP(cischeat_map)
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(cischeat_map2)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_PROGRAM_MAP(cischeat_map2)
- MDRV_CPU_MODIFY("cpu3")
- MDRV_CPU_PROGRAM_MAP(cischeat_map3)
+ MCFG_CPU_MODIFY("cpu3")
+ MCFG_CPU_PROGRAM_MAP(cischeat_map3)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(cischeat_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(cischeat_sound_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-8-1)
- MDRV_GFXDECODE(cischeat)
- MDRV_PALETTE_LENGTH(32*16 * 3 + 64*16 * 2 + 128*16) /* scroll 0,1,2; road 0,1; sprites */
+ MCFG_GFXDECODE(cischeat)
+ MCFG_PALETTE_LENGTH(32*16 * 3 + 64*16 * 2 + 128*16) /* scroll 0,1,2; road 0,1; sprites */
- MDRV_VIDEO_START(cischeat)
- MDRV_VIDEO_UPDATE(cischeat)
+ MCFG_VIDEO_START(cischeat)
+ MCFG_VIDEO_UPDATE(cischeat)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( f1gpstar, bigrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_CLOCK(12000000)
- MDRV_CPU_PROGRAM_MAP(f1gpstar_map)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_CLOCK(12000000)
+ MCFG_CPU_PROGRAM_MAP(f1gpstar_map)
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_CLOCK(12000000)
- MDRV_CPU_PROGRAM_MAP(f1gpstar_map2)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_CLOCK(12000000)
+ MCFG_CPU_PROGRAM_MAP(f1gpstar_map2)
- MDRV_CPU_MODIFY("cpu3")
- MDRV_CPU_CLOCK(12000000)
- MDRV_CPU_PROGRAM_MAP(f1gpstar_map3)
+ MCFG_CPU_MODIFY("cpu3")
+ MCFG_CPU_CLOCK(12000000)
+ MCFG_CPU_PROGRAM_MAP(f1gpstar_map3)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(f1gpstar_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(f1gpstar_sound_map)
/* video hardware */
- MDRV_GFXDECODE(f1gpstar)
- MDRV_PALETTE_LENGTH(16*16 * 3 + 64*16 * 2 + 128*16) /* scroll 0,1,2; road 0,1; sprites */
+ MCFG_GFXDECODE(f1gpstar)
+ MCFG_PALETTE_LENGTH(16*16 * 3 + 64*16 * 2 + 128*16) /* scroll 0,1,2; road 0,1; sprites */
- MDRV_VIDEO_START(f1gpstar)
- MDRV_VIDEO_UPDATE(f1gpstar)
+ MCFG_VIDEO_START(f1gpstar)
+ MCFG_VIDEO_UPDATE(f1gpstar)
MACHINE_CONFIG_END
@@ -1675,15 +1675,15 @@ static MACHINE_CONFIG_DERIVED( f1gpstr2, f1gpstar )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(f1gpstr2_map)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_PROGRAM_MAP(f1gpstr2_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(f1gpstr2_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(f1gpstr2_sound_map)
- MDRV_CPU_ADD("cpu5", M68000, 12000000/* was 10000000 */)
- MDRV_CPU_PROGRAM_MAP(f1gpstr2_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("cpu5", M68000, 12000000/* was 10000000 */)
+ MCFG_CPU_PROGRAM_MAP(f1gpstr2_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
MACHINE_CONFIG_END
@@ -1713,36 +1713,36 @@ static INTERRUPT_GEN( interrupt_scudhamm )
static MACHINE_CONFIG_START( scudhamm, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(scudhamm_map)
- MDRV_CPU_VBLANK_INT_HACK(interrupt_scudhamm,INTERRUPT_NUM_SCUDHAMM)
+ MCFG_CPU_ADD("maincpu",M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(scudhamm_map)
+ MCFG_CPU_VBLANK_INT_HACK(interrupt_scudhamm,INTERRUPT_NUM_SCUDHAMM)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500 * 3) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0 +16, 256-1 -16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500 * 3) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0 +16, 256-1 -16)
- MDRV_GFXDECODE(scudhamm)
- MDRV_PALETTE_LENGTH(16*16+16*16+128*16)
+ MCFG_GFXDECODE(scudhamm)
+ MCFG_PALETTE_LENGTH(16*16+16*16+128*16)
- MDRV_VIDEO_START(f1gpstar)
- MDRV_VIDEO_UPDATE(scudhamm)
+ MCFG_VIDEO_START(f1gpstar)
+ MCFG_VIDEO_UPDATE(scudhamm)
/* 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
@@ -1764,9 +1764,9 @@ static INTERRUPT_GEN( interrupt_armchmp2)
static MACHINE_CONFIG_DERIVED( armchmp2, scudhamm )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(armchmp2_map)
- MDRV_CPU_VBLANK_INT_HACK(interrupt_armchmp2,INTERRUPT_NUM_SCUDHAMM)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(armchmp2_map)
+ MCFG_CPU_VBLANK_INT_HACK(interrupt_armchmp2,INTERRUPT_NUM_SCUDHAMM)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 823aa1fd5b0..ef9cba91d55 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -207,44 +207,44 @@ static MACHINE_RESET( citycon )
static MACHINE_CONFIG_START( citycon, citycon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2048000) /* 2.048 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(citycon_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", M6809, 2048000) /* 2.048 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(citycon_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("audiocpu", M6809, 640000) /* 0.640 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
-// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) //actually unused, probably it was during development
+ MCFG_CPU_ADD("audiocpu", M6809, 640000) /* 0.640 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+// MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) //actually unused, probably it was during development
- MDRV_MACHINE_START(citycon)
- MDRV_MACHINE_RESET(citycon)
+ MCFG_MACHINE_START(citycon)
+ MCFG_MACHINE_RESET(citycon)
/* 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(1*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(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(citycon)
- MDRV_PALETTE_LENGTH(640+1024) /* 640 real palette + 1024 virtual palette */
- MDRV_PALETTE_INIT(all_black) /* guess */
+ MCFG_GFXDECODE(citycon)
+ MCFG_PALETTE_LENGTH(640+1024) /* 640 real palette + 1024 virtual palette */
+ MCFG_PALETTE_INIT(all_black) /* guess */
- MDRV_VIDEO_START(citycon)
- MDRV_VIDEO_UPDATE(citycon)
+ MCFG_VIDEO_START(citycon)
+ MCFG_VIDEO_UPDATE(citycon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1250000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1250000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ymsnd", YM2203, 1250000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ROUTE(2, "mono", 0.40)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1250000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ROUTE(2, "mono", 0.40)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c
index 2c43fe9559b..ffdacdef38c 100644
--- a/src/mame/drivers/clayshoo.c
+++ b/src/mame/drivers/clayshoo.c
@@ -324,26 +324,26 @@ static MACHINE_RESET( clayshoo )
static MACHINE_CONFIG_START( clayshoo, clayshoo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(clayshoo)
- MDRV_MACHINE_RESET(clayshoo)
+ MCFG_MACHINE_START(clayshoo)
+ MCFG_MACHINE_RESET(clayshoo)
/* video hardware */
- MDRV_VIDEO_UPDATE(clayshoo)
+ MCFG_VIDEO_UPDATE(clayshoo)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 64, 255)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 64, 255)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index d58d1749efa..ea0e8b76219 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -687,37 +687,37 @@ DISCRETE_SOUND_EXTERN( cliffhgr );
static MACHINE_CONFIG_START( cliffhgr, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4MHz */
- MDRV_CPU_PROGRAM_MAP(mainmem)
- MDRV_CPU_IO_MAP(mainport)
- MDRV_CPU_VBLANK_INT("screen", cliff_vsync)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4MHz */
+ MCFG_CPU_PROGRAM_MAP(mainmem)
+ MCFG_CPU_IO_MAP(mainport)
+ MCFG_CPU_VBLANK_INT("screen", cliff_vsync)
- MDRV_MACHINE_START(cliffhgr)
- MDRV_MACHINE_RESET(cliffhgr)
+ MCFG_MACHINE_START(cliffhgr)
+ MCFG_MACHINE_RESET(cliffhgr)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_PR8210, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(tms9928a, 15+32*8+15, 27+24*8+24, BITMAP_FORMAT_INDEXED16)
- MDRV_LASERDISC_OVERLAY_CLIP(15-12, 15+32*8+12-1, 27-9, 27+24*8+9-1)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_PR8210, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(tms9928a, 15+32*8+15, 27+24*8+24, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_OVERLAY_CLIP(15-12, 15+32*8+12-1, 27-9, 27+24*8+9-1)
/* start with the TMS9928a video configuration */
- MDRV_FRAGMENT_ADD(tms9928a)
+ MCFG_FRAGMENT_ADD(tms9928a)
/* override video rendering and raw screen info */
- MDRV_DEVICE_REMOVE("screen")
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_DEVICE_REMOVE("screen")
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
/* sound 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)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(cliffhgr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(cliffhgr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index fc9d5a8dc6b..acfbc09df58 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -334,42 +334,42 @@ static const pokey_interface pokey_interface_2 =
static MACHINE_CONFIG_START( cloak, cloak_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
+ MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
- MDRV_CPU_ADD("slave", M6502, 1250000) /* 1.25 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
+ MCFG_CPU_ADD("slave", M6502, 1250000) /* 1.25 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
- MDRV_QUANTUM_TIME(HZ(1000))
+ MCFG_QUANTUM_TIME(HZ(1000))
- 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 3*8, 32*8-1)
+ 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(0*8, 32*8-1, 3*8, 32*8-1)
- MDRV_GFXDECODE(cloak)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(cloak)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_VIDEO_START(cloak)
- MDRV_VIDEO_UPDATE(cloak)
+ MCFG_VIDEO_START(cloak)
+ MCFG_VIDEO_UPDATE(cloak)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, XTAL_10MHz/8) /* Accurate to recording */
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, XTAL_10MHz/8) /* Accurate to recording */
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, XTAL_10MHz/8) /* Accurate to recording */
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, XTAL_10MHz/8) /* Accurate to recording */
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index edf8d8f4996..5e3f4fff391 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -429,38 +429,38 @@ static const pokey_interface pokey_config =
static MACHINE_CONFIG_START( cloud9, cloud9_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(cloud9_map)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(cloud9_map)
- MDRV_MACHINE_START(cloud9)
- MDRV_MACHINE_RESET(cloud9)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_START(cloud9)
+ MCFG_MACHINE_RESET(cloud9)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
- MDRV_X2212_ADD_AUTOSAVE("nvram")
+ MCFG_X2212_ADD_AUTOSAVE("nvram")
/* video hardware */
- MDRV_GFXDECODE(cloud9)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(cloud9)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE((float)PIXEL_CLOCK / (float)VTOTAL / (float)HTOTAL)
- MDRV_SCREEN_SIZE(HTOTAL, VTOTAL)
- MDRV_SCREEN_VBLANK_TIME(0) /* VBLANK is handled manually */
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 231)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE((float)PIXEL_CLOCK / (float)VTOTAL / (float)HTOTAL)
+ MCFG_SCREEN_SIZE(HTOTAL, VTOTAL)
+ MCFG_SCREEN_VBLANK_TIME(0) /* VBLANK is handled manually */
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 231)
- MDRV_VIDEO_START(cloud9)
- MDRV_VIDEO_UPDATE(cloud9)
+ MCFG_VIDEO_START(cloud9)
+ MCFG_VIDEO_UPDATE(cloud9)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 4e72a600888..2800f7f0de7 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -229,71 +229,71 @@ GFXDECODE_END
static MACHINE_CONFIG_START( firebatl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(clshroad_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
+ MCFG_CPU_ADD("maincpu", Z80, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(clshroad_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(clshroad_sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(clshroad_sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
- MDRV_MACHINE_RESET(clshroad)
+ MCFG_MACHINE_RESET(clshroad)
/* 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(0x120, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x120-1, 0x0+16, 0x100-16-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(0x120, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x120-1, 0x0+16, 0x100-16-1)
- MDRV_GFXDECODE(firebatl)
- MDRV_PALETTE_LENGTH(512+64*4)
+ MCFG_GFXDECODE(firebatl)
+ MCFG_PALETTE_LENGTH(512+64*4)
- MDRV_PALETTE_INIT(firebatl)
- MDRV_VIDEO_START(firebatl)
- MDRV_VIDEO_UPDATE(clshroad)
+ MCFG_PALETTE_INIT(firebatl)
+ MCFG_VIDEO_START(firebatl)
+ MCFG_VIDEO_UPDATE(clshroad)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("custom", WIPING, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("custom", WIPING, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( clshroad, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/4) /* ? real speed unknown. 3MHz is too low and causes problems */
- MDRV_CPU_PROGRAM_MAP(clshroad_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/4) /* ? real speed unknown. 3MHz is too low and causes problems */
+ MCFG_CPU_PROGRAM_MAP(clshroad_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* ? */
- MDRV_CPU_PROGRAM_MAP(clshroad_sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* ? */
+ MCFG_CPU_PROGRAM_MAP(clshroad_sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ, no NMI */
- MDRV_MACHINE_RESET(clshroad)
+ MCFG_MACHINE_RESET(clshroad)
/* 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(0x120, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x120-1, 0x0+16, 0x100-16-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(0x120, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x120-1, 0x0+16, 0x100-16-1)
- MDRV_GFXDECODE(clshroad)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(clshroad)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(clshroad)
- MDRV_VIDEO_START(clshroad)
- MDRV_VIDEO_UPDATE(clshroad)
+ MCFG_PALETTE_INIT(clshroad)
+ MCFG_VIDEO_START(clshroad)
+ MCFG_VIDEO_UPDATE(clshroad)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("custom", WIPING, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("custom", WIPING, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c
index ebfcec33b68..e7efa89fbfb 100644
--- a/src/mame/drivers/cmmb.c
+++ b/src/mame/drivers/cmmb.c
@@ -286,29 +286,29 @@ static MACHINE_RESET( cmmb )
static MACHINE_CONFIG_START( cmmb, cmmb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M65C02,8000000/2) // unknown clock
- MDRV_CPU_PROGRAM_MAP(cmmb_map)
- MDRV_CPU_VBLANK_INT("screen",cmmb_irq)
+ MCFG_CPU_ADD("maincpu",M65C02,8000000/2) // unknown clock
+ MCFG_CPU_PROGRAM_MAP(cmmb_map)
+ MCFG_CPU_VBLANK_INT("screen",cmmb_irq)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // unknown
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(cmmb)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // unknown
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
+ MCFG_GFXDECODE(cmmb)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(cmmb)
- MDRV_VIDEO_UPDATE(cmmb)
+ MCFG_VIDEO_START(cmmb)
+ MCFG_VIDEO_UPDATE(cmmb)
- MDRV_MACHINE_RESET(cmmb)
+ MCFG_MACHINE_RESET(cmmb)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+// MCFG_SPEAKER_STANDARD_MONO("mono")
+// MCFG_SOUND_ADD("aysnd", AY8910, 8000000/4)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index e3a0307f1eb..80485575ad6 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -845,289 +845,289 @@ static MACHINE_RESET( cninja )
static MACHINE_CONFIG_START( cninja, cninja_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(cninja_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(cninja_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(cninja)
- MDRV_MACHINE_RESET(cninja)
+ MCFG_MACHINE_START(cninja)
+ MCFG_MACHINE_RESET(cninja)
- MDRV_TIMER_ADD("raster_timer", interrupt_gen)
+ MCFG_TIMER_ADD("raster_timer", interrupt_gen)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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)
- MDRV_GFXDECODE(cninja)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(cninja)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(cninja)
+ MCFG_VIDEO_UPDATE(cninja)
- MDRV_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ym1", YM2203, 32220000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ym2", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( stoneage, cninja_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(cninja_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(cninja_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(stoneage_s_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(stoneage_s_map)
- MDRV_MACHINE_START(cninja)
- MDRV_MACHINE_RESET(cninja)
+ MCFG_MACHINE_START(cninja)
+ MCFG_MACHINE_RESET(cninja)
- MDRV_TIMER_ADD("raster_timer", interrupt_gen)
+ MCFG_TIMER_ADD("raster_timer", interrupt_gen)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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)
- MDRV_GFXDECODE(cninja)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(cninja)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(stoneage)
- MDRV_VIDEO_UPDATE(cninja)
+ MCFG_VIDEO_START(stoneage)
+ MCFG_VIDEO_UPDATE(cninja)
- MDRV_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_interface2)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_interface2)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cninjabl, cninja_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(cninjabl_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(cninjabl_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(stoneage_s_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(stoneage_s_map)
- MDRV_MACHINE_START(cninja)
- MDRV_MACHINE_RESET(cninja)
+ MCFG_MACHINE_START(cninja)
+ MCFG_MACHINE_RESET(cninja)
- MDRV_TIMER_ADD("raster_timer", interrupt_gen)
+ MCFG_TIMER_ADD("raster_timer", interrupt_gen)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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)
- MDRV_GFXDECODE(cninjabl)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(cninjabl)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(cninjabl)
+ MCFG_VIDEO_UPDATE(cninjabl)
- MDRV_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", cninja_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_interface2)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_interface2)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( edrandy, cninja_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(edrandy_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(edrandy_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(cninja)
- MDRV_MACHINE_RESET(cninja)
+ MCFG_MACHINE_START(cninja)
+ MCFG_MACHINE_RESET(cninja)
- MDRV_TIMER_ADD("raster_timer", interrupt_gen)
+ MCFG_TIMER_ADD("raster_timer", interrupt_gen)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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)
- MDRV_GFXDECODE(cninja)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(cninja)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(edrandy)
+ MCFG_VIDEO_UPDATE(edrandy)
- MDRV_DECO16IC_ADD("deco_custom", edrandy_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", edrandy_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ym1", YM2203, 32220000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ym2", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( robocop2, cninja_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(robocop2_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(robocop2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(cninja)
- MDRV_MACHINE_RESET(cninja)
+ MCFG_MACHINE_START(cninja)
+ MCFG_MACHINE_RESET(cninja)
- MDRV_TIMER_ADD("raster_timer", interrupt_gen)
+ MCFG_TIMER_ADD("raster_timer", interrupt_gen)
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(robocop2)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(robocop2)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(robocop2)
+ MCFG_VIDEO_UPDATE(robocop2)
- MDRV_DECO16IC_ADD("deco_custom", robocop2_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", robocop2_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ym1", YM2203, 32220000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
- MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ym2", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mutantf, cninja_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(mutantf_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(mutantf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map_mutantf)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map_mutantf)
- MDRV_MACHINE_START(cninja)
- MDRV_MACHINE_RESET(cninja)
+ MCFG_MACHINE_START(cninja)
+ MCFG_MACHINE_RESET(cninja)
/* 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_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(mutantf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(mutantf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(mutantf)
+ MCFG_VIDEO_UPDATE(mutantf)
- MDRV_DECO16IC_ADD("deco_custom", mutantf_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", mutantf_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
/**********************************************************************************/
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index dcd06ed9436..b75d3d71c69 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -851,94 +851,94 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( cntsteer, cntsteer_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(cntsteer_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
+ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(cntsteer_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
- MDRV_CPU_ADD("subcpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(cntsteer_cpu2_map)
-// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
+ MCFG_CPU_ADD("subcpu", M6809, 2000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(cntsteer_cpu2_map)
+// MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
- MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(sound_interrupt, 480)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(sound_interrupt, 480)
- MDRV_MACHINE_START(cntsteer)
- MDRV_MACHINE_RESET(cntsteer)
+ MCFG_MACHINE_START(cntsteer)
+ MCFG_MACHINE_RESET(cntsteer)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_GFXDECODE(cntsteer)
- MDRV_PALETTE_LENGTH(256)
-// MDRV_PALETTE_INIT(zerotrgt)
+ MCFG_GFXDECODE(cntsteer)
+ MCFG_PALETTE_LENGTH(256)
+// MCFG_PALETTE_INIT(zerotrgt)
- MDRV_VIDEO_START(cntsteer)
- MDRV_VIDEO_UPDATE(cntsteer)
+ MCFG_VIDEO_START(cntsteer)
+ MCFG_VIDEO_UPDATE(cntsteer)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- 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
static MACHINE_CONFIG_START( zerotrgt, cntsteer_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
+ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(gekitsui_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
- MDRV_CPU_ADD("subcpu", M6809, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(gekitsui_cpu2_map)
-// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
+ MCFG_CPU_ADD("subcpu", M6809, 2000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(gekitsui_cpu2_map)
+// MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) /* ? */
- MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(sound_interrupt, 480)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(sound_interrupt, 480)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(zerotrgt)
- MDRV_MACHINE_RESET(zerotrgt)
+ MCFG_MACHINE_START(zerotrgt)
+ MCFG_MACHINE_RESET(zerotrgt)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(zerotrgt)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(zerotrgt)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(zerotrgt)
- MDRV_VIDEO_START(zerotrgt)
- MDRV_VIDEO_UPDATE(zerotrgt)
+ MCFG_PALETTE_INIT(zerotrgt)
+ MCFG_VIDEO_START(zerotrgt)
+ MCFG_VIDEO_UPDATE(zerotrgt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index 31a238dfb3f..c5030a58daf 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -996,56 +996,56 @@ static const mc6845_interface h46505_intf =
static MACHINE_CONFIG_START( coinmstr, coinmstr_state )
- MDRV_CPU_ADD("maincpu",Z80,8000000) // ?
- MDRV_CPU_PROGRAM_MAP(coinmstr_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,8000000) // ?
+ MCFG_CPU_PROGRAM_MAP(coinmstr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_PIA6821_ADD("pia0", pia_0_intf)
- MDRV_PIA6821_ADD("pia1", pia_1_intf)
- MDRV_PIA6821_ADD("pia2", pia_2_intf)
+ MCFG_PIA6821_ADD("pia0", pia_0_intf)
+ MCFG_PIA6821_ADD("pia1", pia_1_intf)
+ MCFG_PIA6821_ADD("pia2", pia_2_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(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 46*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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 46*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(coinmstr)
- MDRV_PALETTE_LENGTH(46*32*4)
+ MCFG_GFXDECODE(coinmstr)
+ MCFG_PALETTE_LENGTH(46*32*4)
- MDRV_VIDEO_START(coinmstr)
- MDRV_VIDEO_UPDATE(coinmstr)
+ MCFG_VIDEO_START(coinmstr)
+ MCFG_VIDEO_UPDATE(coinmstr)
- MDRV_MC6845_ADD("crtc", H46505, 14000000 / 16, h46505_intf)
+ MCFG_MC6845_ADD("crtc", H46505, 14000000 / 16, h46505_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8912_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8912_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizmstr, coinmstr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(quizmstr_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(quizmstr_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( trailblz, coinmstr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(trailblz_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(trailblz_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( supnudg2, coinmstr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(supnudg2_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(supnudg2_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pokeroul, coinmstr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(pokeroul_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(pokeroul_io_map)
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c
index ddc969e3a38..15fb3520078 100644
--- a/src/mame/drivers/coinmvga.c
+++ b/src/mame/drivers/coinmvga.c
@@ -656,36 +656,36 @@ static INTERRUPT_GEN( vblank_irq )
static MACHINE_CONFIG_START( coinmvga, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H83007, CPU_CLOCK) /* xtal */
- MDRV_CPU_PROGRAM_MAP(coinmvga_map)
- MDRV_CPU_IO_MAP(coinmvga_io_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_irq) /* wrong, fix me */
+ MCFG_CPU_ADD("maincpu", H83007, CPU_CLOCK) /* xtal */
+ MCFG_CPU_PROGRAM_MAP(coinmvga_map)
+ MCFG_CPU_IO_MAP(coinmvga_io_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_irq) /* wrong, fix me */
-// 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(640,480)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-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(640,480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
- MDRV_GFXDECODE(coinmvga)
+ MCFG_GFXDECODE(coinmvga)
- MDRV_PALETTE_INIT(coinmvga)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(coinmvga)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(coinmvga)
- MDRV_VIDEO_UPDATE(coinmvga)
+ MCFG_VIDEO_START(coinmvga)
+ MCFG_VIDEO_UPDATE(coinmvga)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, SND_CLOCK)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, SND_CLOCK)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c
index 036b3db1a5b..913ca06cb07 100644
--- a/src/mame/drivers/cojag.c
+++ b/src/mame/drivers/cojag.c
@@ -1119,51 +1119,51 @@ static const jaguar_cpu_config dsp_config =
static MACHINE_CONFIG_START( cojagr3k, cojag_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R3041BE, R3000_CLOCK)
- MDRV_CPU_CONFIG(r3000_config)
- MDRV_CPU_PROGRAM_MAP(r3000_map)
+ MCFG_CPU_ADD("maincpu", R3041BE, R3000_CLOCK)
+ MCFG_CPU_CONFIG(r3000_config)
+ MCFG_CPU_PROGRAM_MAP(r3000_map)
- MDRV_CPU_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK/2)
- MDRV_CPU_CONFIG(gpu_config)
- MDRV_CPU_PROGRAM_MAP(gpu_map)
+ MCFG_CPU_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK/2)
+ MCFG_CPU_CONFIG(gpu_config)
+ MCFG_CPU_PROGRAM_MAP(gpu_map)
- MDRV_CPU_ADD("audiocpu", JAGUARDSP, JAGUAR_CLOCK/2)
- MDRV_CPU_CONFIG(dsp_config)
- MDRV_CPU_PROGRAM_MAP(dsp_map)
+ MCFG_CPU_ADD("audiocpu", JAGUARDSP, JAGUAR_CLOCK/2)
+ MCFG_CPU_CONFIG(dsp_config)
+ MCFG_CPU_PROGRAM_MAP(dsp_map)
- MDRV_MACHINE_RESET(cojag)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(cojag)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_IDE_CONTROLLER_ADD("ide", jaguar_external_int)
+ MCFG_IDE_CONTROLLER_ADD("ide", jaguar_external_int)
- MDRV_TIMER_ADD("serial_timer", jaguar_serial_callback)
+ MCFG_TIMER_ADD("serial_timer", jaguar_serial_callback)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(COJAG_PIXEL_CLOCK/2, 456, 42, 402, 262, 17, 257)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(COJAG_PIXEL_CLOCK/2, 456, 42, 402, 262, 17, 257)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_VIDEO_START(cojag)
- MDRV_VIDEO_UPDATE(cojag)
+ MCFG_VIDEO_START(cojag)
+ MCFG_VIDEO_UPDATE(cojag)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cojag68k, cojagr3k )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", M68EC020, M68K_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(m68020_map)
+ MCFG_CPU_REPLACE("maincpu", M68EC020, M68K_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(m68020_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index ab3efa817d9..f6d336b76cf 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -737,87 +737,87 @@ static MACHINE_RESET( combatsc )
static MACHINE_CONFIG_START( combatsc, combatsc_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
- MDRV_CPU_PROGRAM_MAP(combatsc_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
+ MCFG_CPU_PROGRAM_MAP(combatsc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(combatsc_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(combatsc_sound_map)
- MDRV_QUANTUM_TIME(HZ(1200))
+ MCFG_QUANTUM_TIME(HZ(1200))
- MDRV_MACHINE_START(combatsc)
- MDRV_MACHINE_RESET(combatsc)
+ MCFG_MACHINE_START(combatsc)
+ MCFG_MACHINE_RESET(combatsc)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(combatsc)
- MDRV_PALETTE_LENGTH(8*16*16)
+ MCFG_GFXDECODE(combatsc)
+ MCFG_PALETTE_LENGTH(8*16*16)
- MDRV_PALETTE_INIT(combatsc)
- MDRV_VIDEO_START(combatsc)
- MDRV_VIDEO_UPDATE(combatsc)
+ MCFG_PALETTE_INIT(combatsc)
+ MCFG_VIDEO_START(combatsc)
+ MCFG_VIDEO_UPDATE(combatsc)
- MDRV_K007121_ADD("k007121_1")
- MDRV_K007121_ADD("k007121_2")
+ MCFG_K007121_ADD("k007121_1")
+ MCFG_K007121_ADD("k007121_2")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
/* combat school (bootleg on different hardware) */
static MACHINE_CONFIG_START( combatscb, combatsc_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
- MDRV_CPU_PROGRAM_MAP(combatscb_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
+ MCFG_CPU_PROGRAM_MAP(combatscb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(combatsc_sound_map) /* FAKE */
+ MCFG_CPU_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(combatsc_sound_map) /* FAKE */
- MDRV_QUANTUM_TIME(HZ(1200))
+ MCFG_QUANTUM_TIME(HZ(1200))
- MDRV_MACHINE_START(combatsc)
- MDRV_MACHINE_RESET(combatsc)
+ MCFG_MACHINE_START(combatsc)
+ MCFG_MACHINE_RESET(combatsc)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(combatscb)
- MDRV_PALETTE_LENGTH(8*16*16)
+ MCFG_GFXDECODE(combatscb)
+ MCFG_PALETTE_LENGTH(8*16*16)
- MDRV_PALETTE_INIT(combatscb)
- MDRV_VIDEO_START(combatscb)
- MDRV_VIDEO_UPDATE(combatscb)
+ MCFG_PALETTE_INIT(combatscb)
+ MCFG_VIDEO_START(combatscb)
+ MCFG_VIDEO_UPDATE(combatscb)
/* We are using the original sound subsystem */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c
index 32b0dcfdace..9f083a8c3c1 100644
--- a/src/mame/drivers/comebaby.c
+++ b/src/mame/drivers/comebaby.c
@@ -78,21 +78,21 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( comebaby, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/
- MDRV_CPU_PROGRAM_MAP(comebaby_map)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/
+ MCFG_CPU_PROGRAM_MAP(comebaby_map)
/* video hardware */
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(comebaby)
- MDRV_VIDEO_UPDATE(comebaby)
+ MCFG_VIDEO_START(comebaby)
+ MCFG_VIDEO_UPDATE(comebaby)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 2a0e3e128ed..ed49c1c6c48 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -248,43 +248,43 @@ static MACHINE_RESET( commando )
static MACHINE_CONFIG_START( commando, commando_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, PHI_MAIN) // ???
- MDRV_CPU_PROGRAM_MAP(commando_map)
- MDRV_CPU_VBLANK_INT("screen", commando_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, PHI_MAIN) // ???
+ MCFG_CPU_PROGRAM_MAP(commando_map)
+ MCFG_CPU_VBLANK_INT("screen", commando_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, PHI_B) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
+ MCFG_CPU_ADD("audiocpu", Z80, PHI_B) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
- MDRV_MACHINE_START(commando)
- MDRV_MACHINE_RESET(commando)
+ MCFG_MACHINE_START(commando)
+ MCFG_MACHINE_RESET(commando)
/* 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(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)
+ 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)
- MDRV_GFXDECODE(commando)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(commando)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(commando)
- MDRV_VIDEO_UPDATE(commando)
- MDRV_VIDEO_EOF(commando)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(commando)
+ MCFG_VIDEO_UPDATE(commando)
+ MCFG_VIDEO_EOF(commando)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, PHI_B/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ym1", YM2203, PHI_B/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ym2", YM2203, PHI_B/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ym2", YM2203, PHI_B/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index 6f6267d3ea9..a73ef4de738 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -251,33 +251,33 @@ static MACHINE_RESET( compgolf )
static MACHINE_CONFIG_START( compgolf, compgolf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(compgolf_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(compgolf_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(compgolf)
- MDRV_MACHINE_RESET(compgolf)
+ MCFG_MACHINE_START(compgolf)
+ MCFG_MACHINE_RESET(compgolf)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 32*8-1, 1*8, 31*8-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 32*8-1, 1*8, 31*8-1)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(compgolf)
- MDRV_GFXDECODE(compgolf)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(compgolf)
+ MCFG_GFXDECODE(compgolf)
- MDRV_VIDEO_START(compgolf)
- MDRV_VIDEO_UPDATE(compgolf)
+ MCFG_VIDEO_START(compgolf)
+ MCFG_VIDEO_UPDATE(compgolf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index f5a0c003e8c..a48f5fb02bd 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -184,41 +184,41 @@ static MACHINE_START( contra )
static MACHINE_CONFIG_START( contra, contra_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, XTAL_24MHz/16) /* 1500000? */
- MDRV_CPU_PROGRAM_MAP(contra_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_24MHz/16) /* 1500000? */
+ MCFG_CPU_PROGRAM_MAP(contra_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", M6809, XTAL_24MHz/12) /* 2000000? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, XTAL_24MHz/12) /* 2000000? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(contra)
+ MCFG_MACHINE_START(contra)
/* 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(37*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1)
+ 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(37*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(contra)
- MDRV_PALETTE_LENGTH(2*8*16*16)
+ MCFG_GFXDECODE(contra)
+ MCFG_PALETTE_LENGTH(2*8*16*16)
- MDRV_PALETTE_INIT(contra)
- MDRV_VIDEO_START(contra)
- MDRV_VIDEO_UPDATE(contra)
+ MCFG_PALETTE_INIT(contra)
+ MCFG_VIDEO_START(contra)
+ MCFG_VIDEO_UPDATE(contra)
- MDRV_K007121_ADD("k007121_1")
- MDRV_K007121_ADD("k007121_2")
+ MCFG_K007121_ADD("k007121_1")
+ MCFG_K007121_ADD("k007121_2")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index 96bf7364aaa..bdeea80f106 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -869,73 +869,73 @@ static const tms34010_config tms_config_coolpool =
static MACHINE_CONFIG_START( amerdart, coolpool_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
- MDRV_CPU_CONFIG(tms_config_amerdart)
- MDRV_CPU_PROGRAM_MAP(amerdart_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_CONFIG(tms_config_amerdart)
+ MCFG_CPU_PROGRAM_MAP(amerdart_map)
- MDRV_CPU_ADD("dsp", TMS32015, XTAL_40MHz/2)
- MDRV_CPU_PROGRAM_MAP(amerdart_dsp_pgm_map)
+ MCFG_CPU_ADD("dsp", TMS32015, XTAL_40MHz/2)
+ MCFG_CPU_PROGRAM_MAP(amerdart_dsp_pgm_map)
/* Data Map is internal to the CPU */
- MDRV_CPU_IO_MAP(amerdart_dsp_io_map)
- MDRV_TIMER_ADD_SCANLINE("audioint", amerdart_audio_int_gen, "screen", 0, 1)
+ MCFG_CPU_IO_MAP(amerdart_dsp_io_map)
+ MCFG_TIMER_ADD_SCANLINE("audioint", amerdart_audio_int_gen, "screen", 0, 1)
- MDRV_MACHINE_RESET(amerdart)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(amerdart)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_TIMER_ADD("nvram_timer", nvram_write_timeout)
+ MCFG_TIMER_ADD("nvram_timer", nvram_write_timeout)
/* video hardware */
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(XTAL_40MHz/6, 212*2, 0, 161*2, 262, 0, 241)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/6, 212*2, 0, 161*2, 262, 0, 241)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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
static MACHINE_CONFIG_START( coolpool, coolpool_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
- MDRV_CPU_CONFIG(tms_config_coolpool)
- MDRV_CPU_PROGRAM_MAP(coolpool_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_CONFIG(tms_config_coolpool)
+ MCFG_CPU_PROGRAM_MAP(coolpool_map)
- MDRV_CPU_ADD("dsp", TMS32026,XTAL_40MHz)
- MDRV_CPU_PROGRAM_MAP(coolpool_dsp_pgm_map)
- MDRV_CPU_IO_MAP(coolpool_dsp_io_map)
+ MCFG_CPU_ADD("dsp", TMS32026,XTAL_40MHz)
+ MCFG_CPU_PROGRAM_MAP(coolpool_dsp_pgm_map)
+ MCFG_CPU_IO_MAP(coolpool_dsp_io_map)
- MDRV_MACHINE_RESET(coolpool)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(coolpool)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_TIMER_ADD("nvram_timer", nvram_write_timeout)
+ MCFG_TIMER_ADD("nvram_timer", nvram_write_timeout)
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(XTAL_40MHz/6, 424, 0, 320, 262, 0, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/6, 424, 0, 320, 262, 0, 240)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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
static MACHINE_CONFIG_DERIVED( 9ballsht, coolpool )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nballsht_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(nballsht_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index 34d24a527ab..45a5f16cd35 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -1068,31 +1068,31 @@ static MACHINE_RESET ( coolridr )
}
static MACHINE_CONFIG_START( coolridr, driver_device )
- MDRV_CPU_ADD("maincpu", SH2, 28000000) // 28 mhz
- MDRV_CPU_PROGRAM_MAP(system_h1_map)
- MDRV_CPU_VBLANK_INT("screen",system_h1)
+ MCFG_CPU_ADD("maincpu", SH2, 28000000) // 28 mhz
+ MCFG_CPU_PROGRAM_MAP(system_h1_map)
+ MCFG_CPU_VBLANK_INT("screen",system_h1)
- MDRV_CPU_ADD("soundcpu", M68000, 16000000) // 16 mhz
- MDRV_CPU_PROGRAM_MAP(system_h1_sound_map)
+ MCFG_CPU_ADD("soundcpu", M68000, 16000000) // 16 mhz
+ MCFG_CPU_PROGRAM_MAP(system_h1_sound_map)
- MDRV_CPU_ADD("sub", SH1, 16000000) // SH7032 HD6417032F20!! 16 mhz
- MDRV_CPU_PROGRAM_MAP(coolridr_submap)
- MDRV_CPU_VBLANK_INT_HACK(system_h1_sub, 3)
+ MCFG_CPU_ADD("sub", SH1, 16000000) // SH7032 HD6417032F20!! 16 mhz
+ MCFG_CPU_PROGRAM_MAP(coolridr_submap)
+ MCFG_CPU_VBLANK_INT_HACK(system_h1_sub, 3)
- MDRV_GFXDECODE(coolridr)
+ MCFG_GFXDECODE(coolridr)
- 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(128*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 128*8-1, 0*8, 64*8-1) //TODO: these are just two different screens
+ 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(128*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 128*8-1, 0*8, 64*8-1) //TODO: these are just two different screens
- MDRV_PALETTE_LENGTH(0x10000)
- MDRV_MACHINE_RESET(coolridr)
+ MCFG_PALETTE_LENGTH(0x10000)
+ MCFG_MACHINE_RESET(coolridr)
- MDRV_VIDEO_START(coolridr)
- MDRV_VIDEO_UPDATE(coolridr)
+ MCFG_VIDEO_START(coolridr)
+ MCFG_VIDEO_UPDATE(coolridr)
MACHINE_CONFIG_END
ROM_START( coolridr )
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 19e041376bb..a0927ca0235 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -439,81 +439,81 @@ static MACHINE_RESET( cop01 )
static MACHINE_CONFIG_START( cop01, cop01_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(cop01_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ???? */
+ MCFG_CPU_PROGRAM_MAP(cop01_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(audio_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* ???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(audio_io_map)
- MDRV_MACHINE_START(cop01)
- MDRV_MACHINE_RESET(cop01)
+ MCFG_MACHINE_START(cop01)
+ MCFG_MACHINE_RESET(cop01)
/* 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)
+ 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)
- MDRV_GFXDECODE(cop01)
- MDRV_PALETTE_LENGTH(16+8*16+16*16)
+ MCFG_GFXDECODE(cop01)
+ MCFG_PALETTE_LENGTH(16+8*16+16*16)
- MDRV_PALETTE_INIT(cop01)
- MDRV_VIDEO_START(cop01)
- MDRV_VIDEO_UPDATE(cop01)
+ MCFG_PALETTE_INIT(cop01)
+ MCFG_VIDEO_START(cop01)
+ MCFG_VIDEO_UPDATE(cop01)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay3", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mightguy, cop01_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(cop01_map)
- MDRV_CPU_IO_MAP(mightguy_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ???? */
+ MCFG_CPU_PROGRAM_MAP(cop01_map)
+ MCFG_CPU_IO_MAP(mightguy_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(mightguy_audio_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* ???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(mightguy_audio_io_map)
- MDRV_MACHINE_START(cop01)
- MDRV_MACHINE_RESET(cop01)
+ MCFG_MACHINE_START(cop01)
+ MCFG_MACHINE_RESET(cop01)
/* 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)
+ 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)
- MDRV_GFXDECODE(cop01)
- MDRV_PALETTE_LENGTH(16+8*16+16*16)
+ MCFG_GFXDECODE(cop01)
+ MCFG_PALETTE_LENGTH(16+8*16+16*16)
- MDRV_PALETTE_INIT(cop01)
- MDRV_VIDEO_START(cop01)
- MDRV_VIDEO_UPDATE(cop01)
+ MCFG_PALETTE_INIT(cop01)
+ MCFG_VIDEO_START(cop01)
+ MCFG_VIDEO_UPDATE(cop01)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index 2a32119acf1..a7590742431 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -269,33 +269,33 @@ static MACHINE_RESET( copsnrob )
static MACHINE_CONFIG_START( copsnrob, copsnrob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,14318180/16) /* 894886.25 kHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502,14318180/16) /* 894886.25 kHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(copsnrob)
- MDRV_MACHINE_RESET(copsnrob)
+ MCFG_MACHINE_START(copsnrob)
+ MCFG_MACHINE_RESET(copsnrob)
/* 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(0*8, 32*8-1, 0*8, 26*8-1)
+ 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(0*8, 32*8-1, 0*8, 26*8-1)
- MDRV_GFXDECODE(copsnrob)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(copsnrob)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(copsnrob)
- MDRV_VIDEO_UPDATE(copsnrob)
+ MCFG_PALETTE_INIT(copsnrob)
+ MCFG_VIDEO_UPDATE(copsnrob)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(copsnrob)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(copsnrob)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 3c17c56d9ab..fe9abfcc204 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -1052,71 +1052,71 @@ static MACHINE_RESET( cosmic )
static MACHINE_CONFIG_START( cosmic, cosmic_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,Z80_MASTER_CLOCK/6) /* 1.8026 MHz*/
+ MCFG_CPU_ADD("maincpu", Z80,Z80_MASTER_CLOCK/6) /* 1.8026 MHz*/
- MDRV_MACHINE_START(cosmic)
- MDRV_MACHINE_RESET(cosmic)
+ MCFG_MACHINE_START(cosmic)
+ MCFG_MACHINE_RESET(cosmic)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( panic, cosmic )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
+ MCFG_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(panic_map)
- MDRV_CPU_VBLANK_INT_HACK(panic_interrupt,2)
+ MCFG_CPU_PROGRAM_MAP(panic_map)
+ MCFG_CPU_VBLANK_INT_HACK(panic_interrupt,2)
/* video hardware */
- MDRV_GFXDECODE(panic)
- MDRV_PALETTE_LENGTH(16+8*4)
+ MCFG_GFXDECODE(panic)
+ MCFG_PALETTE_LENGTH(16+8*4)
- MDRV_PALETTE_INIT(panic)
- MDRV_VIDEO_UPDATE(panic)
+ MCFG_PALETTE_INIT(panic)
+ MCFG_VIDEO_UPDATE(panic)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(panic_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(panic_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
static MACHINE_CONFIG_DERIVED( cosmica, cosmic )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
+ MCFG_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cosmica_map)
- MDRV_CPU_VBLANK_INT_HACK(cosmica_interrupt,32)
+ MCFG_CPU_PROGRAM_MAP(cosmica_map)
+ MCFG_CPU_VBLANK_INT_HACK(cosmica_interrupt,32)
/* video hardware */
- MDRV_GFXDECODE(cosmica)
- MDRV_PALETTE_LENGTH(8+16*4)
+ MCFG_GFXDECODE(cosmica)
+ MCFG_PALETTE_LENGTH(8+16*4)
- MDRV_PALETTE_INIT(cosmica)
- MDRV_VIDEO_UPDATE(cosmica)
+ MCFG_PALETTE_INIT(cosmica)
+ MCFG_VIDEO_UPDATE(cosmica)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(cosmica_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(cosmica_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
@@ -1124,62 +1124,62 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cosmicg, cosmic_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS9980, COSMICG_MASTER_CLOCK/8)
+ MCFG_CPU_ADD("maincpu", TMS9980, COSMICG_MASTER_CLOCK/8)
/* 9.828 MHz Crystal */
/* R Nabet : huh ? This would imply the crystal frequency is somehow divided by 2 before being
fed to the tms9904 or tms9980. Also, I have never heard of a tms9900/9980 operating under
1.5MHz. So, if someone can check this... */
- MDRV_CPU_PROGRAM_MAP(cosmicg_map)
- MDRV_CPU_IO_MAP(cosmicg_io_map)
- MDRV_CPU_VBLANK_INT("screen", cosmicg_interrupt)
+ MCFG_CPU_PROGRAM_MAP(cosmicg_map)
+ MCFG_CPU_IO_MAP(cosmicg_io_map)
+ MCFG_CPU_VBLANK_INT("screen", cosmicg_interrupt)
- MDRV_MACHINE_START(cosmic)
- MDRV_MACHINE_RESET(cosmic)
+ MCFG_MACHINE_START(cosmic)
+ MCFG_MACHINE_RESET(cosmic)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(cosmicg)
- MDRV_VIDEO_UPDATE(cosmicg)
+ MCFG_PALETTE_INIT(cosmicg)
+ MCFG_VIDEO_UPDATE(cosmicg)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(cosmicg_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(cosmicg_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
static MACHINE_CONFIG_DERIVED( magspot, cosmic )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
+ MCFG_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magspot_map)
- MDRV_CPU_VBLANK_INT("screen", magspot_interrupt)
+ MCFG_CPU_PROGRAM_MAP(magspot_map)
+ MCFG_CPU_VBLANK_INT("screen", magspot_interrupt)
/* video hardware */
- MDRV_GFXDECODE(panic)
- MDRV_PALETTE_LENGTH(16+8*4)
+ MCFG_GFXDECODE(panic)
+ MCFG_PALETTE_LENGTH(16+8*4)
- MDRV_PALETTE_INIT(magspot)
- MDRV_VIDEO_UPDATE(magspot)
+ MCFG_PALETTE_INIT(magspot)
+ MCFG_VIDEO_UPDATE(magspot)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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
@@ -1188,30 +1188,30 @@ static MACHINE_CONFIG_DERIVED( devzone, magspot )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_UPDATE(devzone)
+ MCFG_VIDEO_UPDATE(devzone)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nomnlnd, cosmic )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
+ MCFG_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magspot_map)
- MDRV_CPU_VBLANK_INT("screen", nomnlnd_interrupt)
+ MCFG_CPU_PROGRAM_MAP(magspot_map)
+ MCFG_CPU_VBLANK_INT("screen", nomnlnd_interrupt)
/* video hardware */
- MDRV_GFXDECODE(panic)
- MDRV_PALETTE_LENGTH(16+8*4)
+ MCFG_GFXDECODE(panic)
+ MCFG_PALETTE_LENGTH(16+8*4)
- MDRV_PALETTE_INIT(nomnlnd)
- MDRV_VIDEO_UPDATE(nomnlnd)
+ MCFG_PALETTE_INIT(nomnlnd)
+ MCFG_VIDEO_UPDATE(nomnlnd)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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/cps1.c b/src/mame/drivers/cps1.c
index d7a49ec3730..b8d9819ce83 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -2965,41 +2965,41 @@ static MACHINE_START( qsound )
static MACHINE_CONFIG_START( cps1_10MHz, cps_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz ) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz ) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", cps1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_MACHINE_START(cps1)
+ MCFG_MACHINE_START(cps1)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.61) /* verified on one of the input gates of the 74ls08@4J on GNG romboard 88620-b-2 */
- 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(8*8, (64-8)*8-1, 2*8, 30*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.61) /* verified on one of the input gates of the 74ls08@4J on GNG romboard 88620-b-2 */
+ 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(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(cps1)
- MDRV_PALETTE_LENGTH(0xc00)
+ MCFG_GFXDECODE(cps1)
+ MCFG_PALETTE_LENGTH(0xc00)
- MDRV_VIDEO_START(cps1)
- MDRV_VIDEO_EOF(cps1)
- MDRV_VIDEO_UPDATE(cps1)
+ MCFG_VIDEO_START(cps1)
+ MCFG_VIDEO_EOF(cps1)
+ MCFG_VIDEO_UPDATE(cps1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("2151", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.35)
- MDRV_SOUND_ROUTE(1, "mono", 0.35)
+ MCFG_SOUND_ADD("2151", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.35)
+ MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* CPS PPU is fed by a 16mhz clock,pin 117 outputs a 4mhz clock which is divided by 4 using 2 74ls74 */
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/4/4, OKIM6295_PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, OKIM6295_PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
#ifndef MESS
@@ -3007,43 +3007,43 @@ static MACHINE_CONFIG_DERIVED( cps1_12MHz, cps1_10MHz )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK( XTAL_12MHz ) /* verified on pcb */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK( XTAL_12MHz ) /* verified on pcb */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pang3, cps1_12MHz )
/* basic machine hardware */
- MDRV_EEPROM_ADD("eeprom", pang3_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", pang3_eeprom_interface)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qsound, cps1_12MHz )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", M68000, XTAL_12MHz ) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(qsound_main_map)
- MDRV_CPU_VBLANK_INT("screen", cps1_qsound_interrupt) /* ??? interrupts per frame */
+ MCFG_CPU_REPLACE("maincpu", M68000, XTAL_12MHz ) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(qsound_main_map)
+ MCFG_CPU_VBLANK_INT("screen", cps1_qsound_interrupt) /* ??? interrupts per frame */
- MDRV_CPU_REPLACE("audiocpu", Z80, XTAL_8MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(qsound_sub_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 250) /* ?? */
+ MCFG_CPU_REPLACE("audiocpu", Z80, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(qsound_sub_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 250) /* ?? */
- MDRV_MACHINE_START(qsound)
+ MCFG_MACHINE_START(qsound)
- MDRV_EEPROM_ADD("eeprom", qsound_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", qsound_eeprom_interface)
/* sound hardware */
- MDRV_DEVICE_REMOVE("mono")
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_DEVICE_REMOVE("mono")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_DEVICE_REMOVE("2151")
- MDRV_DEVICE_REMOVE("oki")
+ MCFG_DEVICE_REMOVE("2151")
+ MCFG_DEVICE_REMOVE("oki")
- MDRV_SOUND_ADD("qsound", QSOUND, QSOUND_CLOCK)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("qsound", QSOUND, QSOUND_CLOCK)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/* bootlegs with PIC */
@@ -3051,42 +3051,42 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cpspicb, cps_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", cps1_qsound_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", cps1_qsound_interrupt)
- MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000)
- MDRV_DEVICE_DISABLE() /* no valid dumps .. */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000)
+ MCFG_DEVICE_DISABLE() /* no valid dumps .. */
- MDRV_MACHINE_START(common)
+ MCFG_MACHINE_START(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(8*8, (64-8)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(cps1)
- MDRV_PALETTE_LENGTH(0xc00)
+ MCFG_GFXDECODE(cps1)
+ MCFG_PALETTE_LENGTH(0xc00)
- MDRV_VIDEO_START(cps1)
- MDRV_VIDEO_EOF(cps1)
- MDRV_VIDEO_UPDATE(cps1)
+ MCFG_VIDEO_START(cps1)
+ MCFG_VIDEO_EOF(cps1)
+ MCFG_VIDEO_UPDATE(cps1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wofhfh, cps1_12MHz )
/* basic machine hardware */
- MDRV_EEPROM_ADD("eeprom", qsound_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", qsound_eeprom_interface)
MACHINE_CONFIG_END
/* incomplete */
@@ -3126,46 +3126,46 @@ static const msm5205_interface msm5205_interface2 =
static MACHINE_CONFIG_START( sf2mdt, cps_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", cps1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sf2mdt_z80map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(sf2mdt_z80map)
- MDRV_MACHINE_START(common)
+ MCFG_MACHINE_START(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(8*8, (64-8)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(cps1)
- MDRV_PALETTE_LENGTH(0xc00)
+ MCFG_GFXDECODE(cps1)
+ MCFG_PALETTE_LENGTH(0xc00)
- MDRV_VIDEO_START(cps1)
- MDRV_VIDEO_EOF(cps1)
- MDRV_VIDEO_UPDATE(cps1)
+ MCFG_VIDEO_START(cps1)
+ MCFG_VIDEO_EOF(cps1)
+ MCFG_VIDEO_UPDATE(cps1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("2151", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.35)
- MDRV_SOUND_ROUTE(1, "mono", 0.35)
+ MCFG_SOUND_ADD("2151", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.35)
+ MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* has 2x MSM5205 instead of OKI6295 */
- MDRV_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
- MDRV_SOUND_CONFIG(msm5205_interface1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
+ MCFG_SOUND_CONFIG(msm5205_interface1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
- MDRV_SOUND_CONFIG(msm5205_interface2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
+ MCFG_SOUND_CONFIG(msm5205_interface2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
/*
@@ -3211,46 +3211,46 @@ Note:
static MACHINE_CONFIG_START( knightsb, cps_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 24000000 / 2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 24000000 / 2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", cps1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 29821000 / 8)
- MDRV_CPU_PROGRAM_MAP(sf2mdt_z80map)
+ MCFG_CPU_ADD("audiocpu", Z80, 29821000 / 8)
+ MCFG_CPU_PROGRAM_MAP(sf2mdt_z80map)
- MDRV_MACHINE_START(common)
+ MCFG_MACHINE_START(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(8*8, (64-8)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(cps1)
- MDRV_PALETTE_LENGTH(0xc00)
+ MCFG_GFXDECODE(cps1)
+ MCFG_PALETTE_LENGTH(0xc00)
- MDRV_VIDEO_START(cps1)
- MDRV_VIDEO_EOF(cps1)
- MDRV_VIDEO_UPDATE(cps1)
+ MCFG_VIDEO_START(cps1)
+ MCFG_VIDEO_EOF(cps1)
+ MCFG_VIDEO_UPDATE(cps1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("2151", YM2151, 29821000 / 8)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.35)
- MDRV_SOUND_ROUTE(1, "mono", 0.35)
+ MCFG_SOUND_ADD("2151", YM2151, 29821000 / 8)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.35)
+ MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* has 2x MSM5205 instead of OKI6295 */
- MDRV_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
- MDRV_SOUND_CONFIG(msm5205_interface1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
+ MCFG_SOUND_CONFIG(msm5205_interface1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
- MDRV_SOUND_CONFIG(msm5205_interface2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
+ MCFG_SOUND_CONFIG(msm5205_interface2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 30f0293efdc..148397ac447 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -1216,24 +1216,24 @@ static MACHINE_START( cps2 )
static MACHINE_CONFIG_START( cps2, cps_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(cps2_map)
- MDRV_CPU_VBLANK_INT_HACK(cps2_interrupt,259) // 262 /* ??? interrupts per frame */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(cps2_map)
+ MCFG_CPU_VBLANK_INT_HACK(cps2_interrupt,259) // 262 /* ??? interrupts per frame */
- MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(qsound_sub_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 251) /* 251 is good (see 'mercy mercy mercy'section of sgemf attract mode for accurate sound sync */
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(qsound_sub_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 251) /* 251 is good (see 'mercy mercy mercy'section of sgemf attract mode for accurate sound sync */
- MDRV_MACHINE_START(cps2)
+ MCFG_MACHINE_START(cps2)
- MDRV_EEPROM_ADD("eeprom", cps2_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", cps2_eeprom_interface)
/* 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_RAW_PARAMS(XTAL_8MHz, 518, 64, 448, 259, 16, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_8MHz, 518, 64, 448, 259, 16, 240)
/*
Measured clocks:
V = 59.6376Hz
@@ -1245,37 +1245,37 @@ static MACHINE_CONFIG_START( cps2, cps_state )
8MHz / 15.4445kHz = 517.983 ~ 518 -> likely
16MHz -> same as 8 but with a /2 divider; also a possibility
*/
- MDRV_GFXDECODE(cps2)
- MDRV_PALETTE_LENGTH(0xc00)
+ MCFG_GFXDECODE(cps2)
+ MCFG_PALETTE_LENGTH(0xc00)
- MDRV_VIDEO_START(cps2)
- MDRV_VIDEO_EOF(cps1)
- MDRV_VIDEO_UPDATE(cps1)
+ MCFG_VIDEO_START(cps2)
+ MCFG_VIDEO_EOF(cps1)
+ MCFG_VIDEO_UPDATE(cps1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("qsound", QSOUND, QSOUND_CLOCK)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("qsound", QSOUND, QSOUND_CLOCK)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dead_cps2, cps2 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dead_cps2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dead_cps2_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gigamn2, cps2 )
- MDRV_DEVICE_REMOVE("audiocpu")
+ MCFG_DEVICE_REMOVE("audiocpu")
- MDRV_DEVICE_REMOVE("qsound")
+ MCFG_DEVICE_REMOVE("qsound")
- MDRV_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index c4df07d0bf4..a6a725010c2 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -2447,80 +2447,80 @@ static const sh2_cpu_core sh2_conf_cps3 = {
};
static MACHINE_CONFIG_FRAGMENT( simm1_64mbit )
- MDRV_FUJITSU_29F016A_ADD("simm1.0")
- MDRV_FUJITSU_29F016A_ADD("simm1.1")
- MDRV_FUJITSU_29F016A_ADD("simm1.2")
- MDRV_FUJITSU_29F016A_ADD("simm1.3")
+ MCFG_FUJITSU_29F016A_ADD("simm1.0")
+ MCFG_FUJITSU_29F016A_ADD("simm1.1")
+ MCFG_FUJITSU_29F016A_ADD("simm1.2")
+ MCFG_FUJITSU_29F016A_ADD("simm1.3")
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( simm2_64mbit )
- MDRV_FUJITSU_29F016A_ADD("simm2.0")
- MDRV_FUJITSU_29F016A_ADD("simm2.1")
- MDRV_FUJITSU_29F016A_ADD("simm2.2")
- MDRV_FUJITSU_29F016A_ADD("simm2.3")
+ MCFG_FUJITSU_29F016A_ADD("simm2.0")
+ MCFG_FUJITSU_29F016A_ADD("simm2.1")
+ MCFG_FUJITSU_29F016A_ADD("simm2.2")
+ MCFG_FUJITSU_29F016A_ADD("simm2.3")
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( simm3_128mbit )
- MDRV_FUJITSU_29F016A_ADD("simm3.0")
- MDRV_FUJITSU_29F016A_ADD("simm3.1")
- MDRV_FUJITSU_29F016A_ADD("simm3.2")
- MDRV_FUJITSU_29F016A_ADD("simm3.3")
- MDRV_FUJITSU_29F016A_ADD("simm3.4")
- MDRV_FUJITSU_29F016A_ADD("simm3.5")
- MDRV_FUJITSU_29F016A_ADD("simm3.6")
- MDRV_FUJITSU_29F016A_ADD("simm3.7")
+ MCFG_FUJITSU_29F016A_ADD("simm3.0")
+ MCFG_FUJITSU_29F016A_ADD("simm3.1")
+ MCFG_FUJITSU_29F016A_ADD("simm3.2")
+ MCFG_FUJITSU_29F016A_ADD("simm3.3")
+ MCFG_FUJITSU_29F016A_ADD("simm3.4")
+ MCFG_FUJITSU_29F016A_ADD("simm3.5")
+ MCFG_FUJITSU_29F016A_ADD("simm3.6")
+ MCFG_FUJITSU_29F016A_ADD("simm3.7")
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( simm4_128mbit )
- MDRV_FUJITSU_29F016A_ADD("simm4.0")
- MDRV_FUJITSU_29F016A_ADD("simm4.1")
- MDRV_FUJITSU_29F016A_ADD("simm4.2")
- MDRV_FUJITSU_29F016A_ADD("simm4.3")
- MDRV_FUJITSU_29F016A_ADD("simm4.4")
- MDRV_FUJITSU_29F016A_ADD("simm4.5")
- MDRV_FUJITSU_29F016A_ADD("simm4.6")
- MDRV_FUJITSU_29F016A_ADD("simm4.7")
+ MCFG_FUJITSU_29F016A_ADD("simm4.0")
+ MCFG_FUJITSU_29F016A_ADD("simm4.1")
+ MCFG_FUJITSU_29F016A_ADD("simm4.2")
+ MCFG_FUJITSU_29F016A_ADD("simm4.3")
+ MCFG_FUJITSU_29F016A_ADD("simm4.4")
+ MCFG_FUJITSU_29F016A_ADD("simm4.5")
+ MCFG_FUJITSU_29F016A_ADD("simm4.6")
+ MCFG_FUJITSU_29F016A_ADD("simm4.7")
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( simm5_128mbit )
- MDRV_FUJITSU_29F016A_ADD("simm5.0")
- MDRV_FUJITSU_29F016A_ADD("simm5.1")
- MDRV_FUJITSU_29F016A_ADD("simm5.2")
- MDRV_FUJITSU_29F016A_ADD("simm5.3")
- MDRV_FUJITSU_29F016A_ADD("simm5.4")
- MDRV_FUJITSU_29F016A_ADD("simm5.5")
- MDRV_FUJITSU_29F016A_ADD("simm5.6")
- MDRV_FUJITSU_29F016A_ADD("simm5.7")
+ MCFG_FUJITSU_29F016A_ADD("simm5.0")
+ MCFG_FUJITSU_29F016A_ADD("simm5.1")
+ MCFG_FUJITSU_29F016A_ADD("simm5.2")
+ MCFG_FUJITSU_29F016A_ADD("simm5.3")
+ MCFG_FUJITSU_29F016A_ADD("simm5.4")
+ MCFG_FUJITSU_29F016A_ADD("simm5.5")
+ MCFG_FUJITSU_29F016A_ADD("simm5.6")
+ MCFG_FUJITSU_29F016A_ADD("simm5.7")
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( simm5_32mbit )
- MDRV_FUJITSU_29F016A_ADD("simm5.0")
- MDRV_FUJITSU_29F016A_ADD("simm5.1")
+ MCFG_FUJITSU_29F016A_ADD("simm5.0")
+ MCFG_FUJITSU_29F016A_ADD("simm5.1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( simm6_128mbit )
- MDRV_FUJITSU_29F016A_ADD("simm6.0")
- MDRV_FUJITSU_29F016A_ADD("simm6.1")
- MDRV_FUJITSU_29F016A_ADD("simm6.2")
- MDRV_FUJITSU_29F016A_ADD("simm6.3")
- MDRV_FUJITSU_29F016A_ADD("simm6.4")
- MDRV_FUJITSU_29F016A_ADD("simm6.5")
- MDRV_FUJITSU_29F016A_ADD("simm6.6")
- MDRV_FUJITSU_29F016A_ADD("simm6.7")
+ MCFG_FUJITSU_29F016A_ADD("simm6.0")
+ MCFG_FUJITSU_29F016A_ADD("simm6.1")
+ MCFG_FUJITSU_29F016A_ADD("simm6.2")
+ MCFG_FUJITSU_29F016A_ADD("simm6.3")
+ MCFG_FUJITSU_29F016A_ADD("simm6.4")
+ MCFG_FUJITSU_29F016A_ADD("simm6.5")
+ MCFG_FUJITSU_29F016A_ADD("simm6.6")
+ MCFG_FUJITSU_29F016A_ADD("simm6.7")
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cps3, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the intenral multiplier to 4x (this should probably be handled in the core..)
- MDRV_CPU_PROGRAM_MAP(cps3_map)
- MDRV_CPU_VBLANK_INT("screen", cps3_vbl_interrupt)
- MDRV_CPU_PERIODIC_INT(cps3_other_interrupt,80) /* ?source? */
- MDRV_CPU_CONFIG(sh2_conf_cps3)
+ MCFG_CPU_ADD("maincpu", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the intenral multiplier to 4x (this should probably be handled in the core..)
+ MCFG_CPU_PROGRAM_MAP(cps3_map)
+ MCFG_CPU_VBLANK_INT("screen", cps3_vbl_interrupt)
+ MCFG_CPU_PERIODIC_INT(cps3_other_interrupt,80) /* ?source? */
+ MCFG_CPU_CONFIG(sh2_conf_cps3)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(XTAL_60MHz/8, 486, 0, 384, 259, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_60MHz/8, 486, 0, 384, 259, 0, 224)
/*
Measured clocks:
V = 59.5992Hz
@@ -2532,69 +2532,69 @@ static MACHINE_CONFIG_START( cps3, driver_device )
42.9545MHz / 15.4445kHz = 2781.217 / 6 = 463.536 -> unlikely
*/
- MDRV_MACHINE_START(cps3)
- MDRV_MACHINE_RESET(cps3)
- MDRV_NVRAM_ADD_0FILL("eeprom")
- MDRV_PALETTE_LENGTH(0x10000) // actually 0x20000 ...
+ MCFG_MACHINE_START(cps3)
+ MCFG_MACHINE_RESET(cps3)
+ MCFG_NVRAM_ADD_0FILL("eeprom")
+ MCFG_PALETTE_LENGTH(0x10000) // actually 0x20000 ...
- MDRV_VIDEO_START(cps3)
- MDRV_VIDEO_UPDATE(cps3)
+ MCFG_VIDEO_START(cps3)
+ MCFG_VIDEO_UPDATE(cps3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("cps3", CPS3, MASTER_CLOCK / 3)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("cps3", CPS3, MASTER_CLOCK / 3)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MACHINE_CONFIG_END
/* individual configs for each machine, depending on the SIMMs installed */
MACHINE_CONFIG_DERIVED( jojo, cps3 )
- MDRV_FRAGMENT_ADD(simm1_64mbit)
- MDRV_FRAGMENT_ADD(simm2_64mbit)
- MDRV_FRAGMENT_ADD(simm3_128mbit)
- MDRV_FRAGMENT_ADD(simm4_128mbit)
- MDRV_FRAGMENT_ADD(simm5_32mbit)
+ MCFG_FRAGMENT_ADD(simm1_64mbit)
+ MCFG_FRAGMENT_ADD(simm2_64mbit)
+ MCFG_FRAGMENT_ADD(simm3_128mbit)
+ MCFG_FRAGMENT_ADD(simm4_128mbit)
+ MCFG_FRAGMENT_ADD(simm5_32mbit)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( jojoba, cps3 )
- MDRV_FRAGMENT_ADD(simm1_64mbit)
- MDRV_FRAGMENT_ADD(simm2_64mbit)
- MDRV_FRAGMENT_ADD(simm3_128mbit)
- MDRV_FRAGMENT_ADD(simm4_128mbit)
- MDRV_FRAGMENT_ADD(simm5_128mbit)
+ MCFG_FRAGMENT_ADD(simm1_64mbit)
+ MCFG_FRAGMENT_ADD(simm2_64mbit)
+ MCFG_FRAGMENT_ADD(simm3_128mbit)
+ MCFG_FRAGMENT_ADD(simm4_128mbit)
+ MCFG_FRAGMENT_ADD(simm5_128mbit)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( sfiii, cps3 )
- MDRV_FRAGMENT_ADD(simm1_64mbit)
- MDRV_FRAGMENT_ADD(simm3_128mbit)
- MDRV_FRAGMENT_ADD(simm4_128mbit)
- MDRV_FRAGMENT_ADD(simm5_32mbit)
+ MCFG_FRAGMENT_ADD(simm1_64mbit)
+ MCFG_FRAGMENT_ADD(simm3_128mbit)
+ MCFG_FRAGMENT_ADD(simm4_128mbit)
+ MCFG_FRAGMENT_ADD(simm5_32mbit)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( sfiii2, cps3 )
- MDRV_FRAGMENT_ADD(simm1_64mbit)
- MDRV_FRAGMENT_ADD(simm2_64mbit)
- MDRV_FRAGMENT_ADD(simm3_128mbit)
- MDRV_FRAGMENT_ADD(simm4_128mbit)
- MDRV_FRAGMENT_ADD(simm5_128mbit)
+ MCFG_FRAGMENT_ADD(simm1_64mbit)
+ MCFG_FRAGMENT_ADD(simm2_64mbit)
+ MCFG_FRAGMENT_ADD(simm3_128mbit)
+ MCFG_FRAGMENT_ADD(simm4_128mbit)
+ MCFG_FRAGMENT_ADD(simm5_128mbit)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( sfiii3, cps3 )
- MDRV_FRAGMENT_ADD(simm1_64mbit)
- MDRV_FRAGMENT_ADD(simm2_64mbit)
- MDRV_FRAGMENT_ADD(simm3_128mbit)
- MDRV_FRAGMENT_ADD(simm4_128mbit)
- MDRV_FRAGMENT_ADD(simm5_128mbit)
- MDRV_FRAGMENT_ADD(simm6_128mbit)
+ MCFG_FRAGMENT_ADD(simm1_64mbit)
+ MCFG_FRAGMENT_ADD(simm2_64mbit)
+ MCFG_FRAGMENT_ADD(simm3_128mbit)
+ MCFG_FRAGMENT_ADD(simm4_128mbit)
+ MCFG_FRAGMENT_ADD(simm5_128mbit)
+ MCFG_FRAGMENT_ADD(simm6_128mbit)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( redearth, cps3 )
- MDRV_FRAGMENT_ADD(simm1_64mbit)
- MDRV_FRAGMENT_ADD(simm3_128mbit)
- MDRV_FRAGMENT_ADD(simm4_128mbit)
- MDRV_FRAGMENT_ADD(simm5_32mbit)
+ MCFG_FRAGMENT_ADD(simm1_64mbit)
+ MCFG_FRAGMENT_ADD(simm3_128mbit)
+ MCFG_FRAGMENT_ADD(simm4_128mbit)
+ MCFG_FRAGMENT_ADD(simm5_32mbit)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index 7e388fdfe9b..3689c77f398 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -361,31 +361,31 @@ static MACHINE_RESET( crballoon )
static MACHINE_CONFIG_START( crbaloon, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CRBALOON_MASTER_XTAL / 3)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CRBALOON_MASTER_XTAL / 3)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(crballoon)
+ MCFG_MACHINE_RESET(crballoon)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(crbaloon)
- MDRV_VIDEO_UPDATE(crbaloon)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(crbaloon)
+ MCFG_VIDEO_UPDATE(crbaloon)
- MDRV_GFXDECODE(crbaloon)
- MDRV_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(crbaloon)
+ MCFG_GFXDECODE(crbaloon)
+ MCFG_PALETTE_LENGTH(32)
+ MCFG_PALETTE_INIT(crbaloon)
- 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, 0*8, 28*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, 32*8-1, 0*8, 28*8-1)
/* audio hardware */
- MDRV_FRAGMENT_ADD(crbaloon_audio)
+ MCFG_FRAGMENT_ADD(crbaloon_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index bbe53fa83f0..930ca5aeeeb 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -385,33 +385,33 @@ static const msm5205_interface msm5205_intf =
static MACHINE_CONFIG_START( crgolf, crgolf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/3/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,MASTER_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80,MASTER_CLOCK/3/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(crgolf)
- MDRV_MACHINE_RESET(crgolf)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_MACHINE_START(crgolf)
+ MCFG_MACHINE_RESET(crgolf)
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_FRAGMENT_ADD(crgolf_video)
+ MCFG_FRAGMENT_ADD(crgolf_video)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/3/2/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/3/2/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( crgolfhi, crgolf )
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 7c5e9c03ba1..02144163588 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -278,48 +278,48 @@ static MACHINE_RESET( crimfght )
static MACHINE_CONFIG_START( crimfght, crimfght_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(crimfght_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(crimfght_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* verified with PCB */
- MDRV_CPU_PROGRAM_MAP(crimfght_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* verified with PCB */
+ MCFG_CPU_PROGRAM_MAP(crimfght_sound_map)
- MDRV_MACHINE_START(crimfght)
- MDRV_MACHINE_RESET(crimfght)
+ MCFG_MACHINE_START(crimfght)
+ MCFG_MACHINE_RESET(crimfght)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54) /* adjusted - compared with PCB speed */
- 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 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54) /* adjusted - compared with PCB speed */
+ 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 )
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(crimfght)
- MDRV_VIDEO_UPDATE(crimfght)
+ MCFG_VIDEO_START(crimfght)
+ MCFG_VIDEO_UPDATE(crimfght)
- MDRV_K052109_ADD("k052109", crimfght_k052109_intf)
- MDRV_K051960_ADD("k051960", crimfght_k051960_intf)
+ MCFG_K052109_ADD("k052109", crimfght_k052109_intf)
+ MCFG_K051960_ADD("k051960", crimfght_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) /* verified with PCB */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545) /* verified with PCB */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index f799ebea9dc..a6d905e7f13 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -349,79 +349,79 @@ static MACHINE_RESET( crospang )
static MACHINE_CONFIG_START( crospang, crospang_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14318180/2)
- MDRV_CPU_PROGRAM_MAP(crospang_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14318180/2)
+ MCFG_CPU_PROGRAM_MAP(crospang_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 14318180/4)
- MDRV_CPU_PROGRAM_MAP(crospang_sound_map)
- MDRV_CPU_IO_MAP(crospang_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_CPU_PROGRAM_MAP(crospang_sound_map)
+ MCFG_CPU_IO_MAP(crospang_sound_io_map)
- MDRV_MACHINE_START(crospang)
- MDRV_MACHINE_RESET(crospang)
+ MCFG_MACHINE_START(crospang)
+ MCFG_MACHINE_RESET(crospang)
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1)
- MDRV_PALETTE_LENGTH(0x300)
- MDRV_GFXDECODE(crospang)
+ MCFG_PALETTE_LENGTH(0x300)
+ MCFG_GFXDECODE(crospang)
- MDRV_VIDEO_START(crospang)
- MDRV_VIDEO_UPDATE(crospang)
+ MCFG_VIDEO_START(crospang)
+ MCFG_VIDEO_UPDATE(crospang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- 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( bestri, crospang_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14318180/2)
- MDRV_CPU_PROGRAM_MAP(bestri_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14318180/2)
+ MCFG_CPU_PROGRAM_MAP(bestri_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 14318180/4)
- MDRV_CPU_PROGRAM_MAP(crospang_sound_map)
- MDRV_CPU_IO_MAP(crospang_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_CPU_PROGRAM_MAP(crospang_sound_map)
+ MCFG_CPU_IO_MAP(crospang_sound_io_map)
- MDRV_MACHINE_START(crospang)
- MDRV_MACHINE_RESET(crospang)
+ MCFG_MACHINE_START(crospang)
+ MCFG_MACHINE_RESET(crospang)
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1)
- MDRV_PALETTE_LENGTH(0x300)
- MDRV_GFXDECODE(crospang)
+ MCFG_PALETTE_LENGTH(0x300)
+ MCFG_GFXDECODE(crospang)
- MDRV_VIDEO_START(crospang)
- MDRV_VIDEO_UPDATE(crospang)
+ MCFG_VIDEO_START(crospang)
+ MCFG_VIDEO_UPDATE(crospang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- 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/crshrace.c b/src/mame/drivers/crshrace.c
index ad2d353b1b8..d5646b14265 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -470,44 +470,44 @@ static MACHINE_RESET( crshrace )
static MACHINE_CONFIG_START( crshrace, crshrace_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(crshrace_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,16000000) /* 16 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(crshrace_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_MACHINE_START(crshrace)
- MDRV_MACHINE_RESET(crshrace)
+ MCFG_MACHINE_START(crshrace)
+ MCFG_MACHINE_RESET(crshrace)
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(crshrace)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(crshrace)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_K053936_ADD("k053936", crshrace_k053936_intf)
+ MCFG_K053936_ADD("k053936", crshrace_k053936_intf)
- MDRV_VIDEO_START(crshrace)
- MDRV_VIDEO_EOF(crshrace)
- MDRV_VIDEO_UPDATE(crshrace)
+ MCFG_VIDEO_START(crshrace)
+ MCFG_VIDEO_EOF(crshrace)
+ MCFG_VIDEO_UPDATE(crshrace)
/* 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
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index e5434dbef3e..f4dc67b907b 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -817,38 +817,38 @@ static const vr0video_interface vr0video_config =
static MACHINE_CONFIG_START( crystal, crystal_state )
- MDRV_CPU_ADD("maincpu", SE3208, 43000000)
- MDRV_CPU_PROGRAM_MAP(crystal_mem)
- MDRV_CPU_VBLANK_INT("screen", crystal_interrupt)
+ MCFG_CPU_ADD("maincpu", SE3208, 43000000)
+ MCFG_CPU_PROGRAM_MAP(crystal_mem)
+ MCFG_CPU_VBLANK_INT("screen", crystal_interrupt)
- MDRV_MACHINE_START(crystal)
- MDRV_MACHINE_RESET(crystal)
+ MCFG_MACHINE_START(crystal)
+ MCFG_MACHINE_RESET(crystal)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_VIDEO_UPDATE(crystal)
- MDRV_VIDEO_EOF(crystal)
+ MCFG_VIDEO_UPDATE(crystal)
+ MCFG_VIDEO_EOF(crystal)
- MDRV_VIDEO_VRENDER0_ADD("vr0", vr0video_config)
+ MCFG_VIDEO_VRENDER0_ADD("vr0", vr0video_config)
- MDRV_PALETTE_INIT(RRRRR_GGGGGG_BBBBB)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_INIT(RRRRR_GGGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_DS1302_ADD("rtc")
+ MCFG_DS1302_ADD("rtc")
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("vrender", VRENDER0, 0)
- MDRV_SOUND_CONFIG(vr0_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("vrender", VRENDER0, 0)
+ MCFG_SOUND_CONFIG(vr0_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/*
@@ -856,9 +856,9 @@ MACHINE_CONFIG_END
*/
static MACHINE_CONFIG_DERIVED( topbladv, crystal )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(320+32, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 319+32, 0, 239)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(320+32, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319+32, 0, 239)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index f3b54663147..0c20f14c981 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -417,28 +417,28 @@ static GFXDECODE_START( cshooter )
GFXDECODE_END
static MACHINE_CONFIG_START( cshooter, driver_device )
- MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cshooter_map)
- MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cshooter_map)
+ MCFG_CPU_VBLANK_INT_HACK(cshooter_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_RESET(cshooter)
+ MCFG_MACHINE_RESET(cshooter)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16)
- MDRV_GFXDECODE(cshooter)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(cshooter)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(cshooter)
- MDRV_VIDEO_UPDATE(cshooter)
+ MCFG_VIDEO_START(cshooter)
+ MCFG_VIDEO_UPDATE(cshooter)
/* sound hardware */
/* YM2151 and ym3931 seibu custom cpu running at XTAL_14_31818MHz/4 */
@@ -446,28 +446,28 @@ static MACHINE_CONFIG_START( cshooter, driver_device )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( airraid, driver_device )
- MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(airraid_map)
- MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(airraid_map)
+ MCFG_CPU_VBLANK_INT_HACK(cshooter_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map2)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map2)
- MDRV_MACHINE_RESET(cshooter)
+ MCFG_MACHINE_RESET(cshooter)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16)
-
- MDRV_GFXDECODE(cshooter)
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(cshooter)
- MDRV_VIDEO_UPDATE(cshooter)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16)
+
+ MCFG_GFXDECODE(cshooter)
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(cshooter)
+ MCFG_VIDEO_UPDATE(cshooter)
/* sound hardware */
/* YM2151 and ym3931 seibu custom cpu running at XTAL_14_31818MHz/4 */
diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c
index 398ffc20b76..d8667941ca4 100644
--- a/src/mame/drivers/csplayh5.c
+++ b/src/mame/drivers/csplayh5.c
@@ -500,55 +500,55 @@ static const z80_daisy_config daisy_chain_sound[] =
static MACHINE_CONFIG_START( csplayh5, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,16000000) /* TMP68301-16 */
- MDRV_CPU_PROGRAM_MAP(csplayh5_map)
- MDRV_CPU_VBLANK_INT("screen", csplayh5_irq )
- MDRV_CPU_PERIODIC_INT(scanline_irq,262*60) // unknown timing
+ MCFG_CPU_ADD("maincpu",M68000,16000000) /* TMP68301-16 */
+ MCFG_CPU_PROGRAM_MAP(csplayh5_map)
+ MCFG_CPU_VBLANK_INT("screen", csplayh5_irq )
+ MCFG_CPU_PERIODIC_INT(scanline_irq,262*60) // unknown timing
#if USE_H8
- MDRV_CPU_ADD("subcpu", H83002, 16000000) /* unknown clock */
- MDRV_CPU_PROGRAM_MAP(csplayh5_sub_map)
- MDRV_CPU_IO_MAP(csplayh5_sub_io_map)
+ MCFG_CPU_ADD("subcpu", H83002, 16000000) /* unknown clock */
+ MCFG_CPU_PROGRAM_MAP(csplayh5_sub_map)
+ MCFG_CPU_IO_MAP(csplayh5_sub_io_map)
#endif
- MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* TMPZ84C011, unknown clock */
- MDRV_CPU_CONFIG(daisy_chain_sound)
- MDRV_CPU_PROGRAM_MAP(csplayh5_sound_map)
- MDRV_CPU_IO_MAP(csplayh5_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* TMPZ84C011, unknown clock */
+ MCFG_CPU_CONFIG(daisy_chain_sound)
+ MCFG_CPU_PROGRAM_MAP(csplayh5_sound_map)
+ MCFG_CPU_IO_MAP(csplayh5_sound_io_map)
- MDRV_Z80CTC_ADD("ctc", 8000000, ctc_intf)
+ MCFG_Z80CTC_ADD("ctc", 8000000, ctc_intf)
- MDRV_MACHINE_RESET(csplayh5)
+ MCFG_MACHINE_RESET(csplayh5)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen",RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_ADD("screen",RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS)
- MDRV_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1)
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT( v9958 )
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS)
+ MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT( v9958 )
- MDRV_VIDEO_START(csplayh5)
- MDRV_VIDEO_UPDATE(csplayh5)
+ MCFG_VIDEO_START(csplayh5)
+ MCFG_VIDEO_UPDATE(csplayh5)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 9cbb8bfc295..a594090a031 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -495,77 +495,77 @@ static const cubeqst_lin_config lin_config =
*************************************/
static MACHINE_CONFIG_START( cubeqst, driver_device )
- MDRV_CPU_ADD("main_cpu", M68000, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(m68k_program_map)
- MDRV_CPU_VBLANK_INT("screen", vblank)
-
- MDRV_CPU_ADD("rotate_cpu", CQUESTROT, XTAL_10MHz / 2)
- MDRV_CPU_PROGRAM_MAP(rotate_map)
- MDRV_CPU_CONFIG(rot_config)
-
- MDRV_CPU_ADD("line_cpu", CQUESTLIN, XTAL_10MHz / 2)
- MDRV_CPU_PROGRAM_MAP(line_sound_map)
- MDRV_CPU_CONFIG(lin_config)
-
- MDRV_CPU_ADD("sound_cpu", CQUESTSND, XTAL_10MHz / 2)
- MDRV_CPU_PROGRAM_MAP(line_sound_map)
- MDRV_CPU_CONFIG(snd_config)
-
- MDRV_QUANTUM_TIME(HZ(48000))
-
- MDRV_MACHINE_START(cubeqst)
- MDRV_MACHINE_RESET(cubeqst)
- MDRV_NVRAM_ADD_0FILL("nvram")
-
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
- MDRV_VIDEO_START(cubeqst)
-
- MDRV_PALETTE_INIT(cubeqst)
-
- MDRV_LASERDISC_ADD("laserdisc", SIMUTREK_SPECIAL, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(cubeqst, CUBEQST_HBLANK, CUBEQST_VCOUNT, BITMAP_FORMAT_RGB32)
- MDRV_LASERDISC_OVERLAY_CLIP(0, 320-1, 0, 256-8)
- MDRV_LASERDISC_OVERLAY_POSITION(0.002, -0.018)
- MDRV_LASERDISC_OVERLAY_SCALE(1.0, 1.030)
-
- MDRV_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)
-
- MDRV_SOUND_ADD("rdac0", DAC, 0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.125)
- MDRV_SOUND_ADD("ldac0", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.125)
- MDRV_SOUND_ADD("rdac1", DAC, 0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.125)
- MDRV_SOUND_ADD("ldac1", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.125)
- MDRV_SOUND_ADD("rdac2", DAC, 0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.125)
- MDRV_SOUND_ADD("ldac2", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.125)
- MDRV_SOUND_ADD("rdac3", DAC, 0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.125)
- MDRV_SOUND_ADD("ldac3", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.125)
- MDRV_SOUND_ADD("rdac4", DAC, 0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.125)
- MDRV_SOUND_ADD("ldac4", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.125)
- MDRV_SOUND_ADD("rdac5", DAC, 0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.125)
- MDRV_SOUND_ADD("ldac5", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.125)
- MDRV_SOUND_ADD("rdac6", DAC, 0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.125)
- MDRV_SOUND_ADD("ldac6", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.125)
- MDRV_SOUND_ADD("rdac7", DAC, 0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.125)
- MDRV_SOUND_ADD("ldac7", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.125)
+ MCFG_CPU_ADD("main_cpu", M68000, XTAL_16MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(m68k_program_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank)
+
+ MCFG_CPU_ADD("rotate_cpu", CQUESTROT, XTAL_10MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(rotate_map)
+ MCFG_CPU_CONFIG(rot_config)
+
+ MCFG_CPU_ADD("line_cpu", CQUESTLIN, XTAL_10MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(line_sound_map)
+ MCFG_CPU_CONFIG(lin_config)
+
+ MCFG_CPU_ADD("sound_cpu", CQUESTSND, XTAL_10MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(line_sound_map)
+ MCFG_CPU_CONFIG(snd_config)
+
+ MCFG_QUANTUM_TIME(HZ(48000))
+
+ MCFG_MACHINE_START(cubeqst)
+ MCFG_MACHINE_RESET(cubeqst)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
+ MCFG_VIDEO_START(cubeqst)
+
+ MCFG_PALETTE_INIT(cubeqst)
+
+ MCFG_LASERDISC_ADD("laserdisc", SIMUTREK_SPECIAL, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(cubeqst, CUBEQST_HBLANK, CUBEQST_VCOUNT, BITMAP_FORMAT_RGB32)
+ MCFG_LASERDISC_OVERLAY_CLIP(0, 320-1, 0, 256-8)
+ MCFG_LASERDISC_OVERLAY_POSITION(0.002, -0.018)
+ MCFG_LASERDISC_OVERLAY_SCALE(1.0, 1.030)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("rdac0", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.125)
+ MCFG_SOUND_ADD("ldac0", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.125)
+ MCFG_SOUND_ADD("rdac1", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.125)
+ MCFG_SOUND_ADD("ldac1", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.125)
+ MCFG_SOUND_ADD("rdac2", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.125)
+ MCFG_SOUND_ADD("ldac2", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.125)
+ MCFG_SOUND_ADD("rdac3", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.125)
+ MCFG_SOUND_ADD("ldac3", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.125)
+ MCFG_SOUND_ADD("rdac4", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.125)
+ MCFG_SOUND_ADD("ldac4", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.125)
+ MCFG_SOUND_ADD("rdac5", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.125)
+ MCFG_SOUND_ADD("ldac5", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.125)
+ MCFG_SOUND_ADD("rdac6", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.125)
+ MCFG_SOUND_ADD("ldac6", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.125)
+ MCFG_SOUND_ADD("rdac7", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.125)
+ MCFG_SOUND_ADD("ldac7", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.125)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index 691c2be9a5f..7f7f0b69391 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -1052,43 +1052,43 @@ static const i2cmem_interface i2cmem_interface =
static MACHINE_CONFIG_START( cd32, cubocd32_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, AMIGA_68EC020_PAL_CLOCK) /* 14.3 Mhz */
- MDRV_CPU_PROGRAM_MAP(cd32_map)
- MDRV_DEVICE_ADD("akiko", AKIKO, 0)
+ MCFG_CPU_ADD("maincpu", M68EC020, AMIGA_68EC020_PAL_CLOCK) /* 14.3 Mhz */
+ MCFG_CPU_PROGRAM_MAP(cd32_map)
+ MCFG_DEVICE_ADD("akiko", AKIKO, 0)
- MDRV_MACHINE_RESET(amiga)
+ MCFG_MACHINE_RESET(amiga)
- MDRV_I2CMEM_ADD("i2cmem",i2cmem_interface)
+ MCFG_I2CMEM_ADD("i2cmem",i2cmem_interface)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(512*2, 312)
- MDRV_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(512*2, 312)
+ MCFG_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1)
- MDRV_VIDEO_START(amiga_aga)
- MDRV_VIDEO_UPDATE(amiga_aga)
+ MCFG_VIDEO_START(amiga_aga)
+ MCFG_VIDEO_UPDATE(amiga_aga)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("amiga", AMIGA, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.25)
+ MCFG_SOUND_ADD("amiga", AMIGA, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.25)
- MDRV_SOUND_ADD( "cdda", CDDA, 0 )
- MDRV_SOUND_ROUTE( 0, "lspeaker", 0.50 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 0.50 )
+ MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 0.50 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 0.50 )
/* cia */
- MDRV_MOS8520_ADD("cia_0", AMIGA_68EC020_PAL_CLOCK / 10, cia_0_intf)
- MDRV_MOS8520_ADD("cia_1", AMIGA_68EC020_PAL_CLOCK / 10, cia_1_intf)
+ MCFG_MOS8520_ADD("cia_0", AMIGA_68EC020_PAL_CLOCK / 10, cia_0_intf)
+ MCFG_MOS8520_ADD("cia_1", AMIGA_68EC020_PAL_CLOCK / 10, cia_1_intf)
MACHINE_CONFIG_END
#define ROM_LOAD16_WORD_BIOS(bios,name,offset,length,hash) ROMX_LOAD(name, offset, length, hash, ROM_BIOS(bios+1))
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index f9d8166a8c0..9445015687a 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -387,33 +387,33 @@ static MACHINE_RESET( cultures )
static MACHINE_CONFIG_START( cultures, cultures_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
- MDRV_CPU_PROGRAM_MAP(cultures_map)
- MDRV_CPU_IO_MAP(cultures_io_map)
- MDRV_CPU_VBLANK_INT("screen", cultures_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(cultures_map)
+ MCFG_CPU_IO_MAP(cultures_io_map)
+ MCFG_CPU_VBLANK_INT("screen", cultures_interrupt)
- MDRV_MACHINE_START(cultures)
- MDRV_MACHINE_RESET(cultures)
+ MCFG_MACHINE_START(cultures)
+ MCFG_MACHINE_RESET(cultures)
/* 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, 48*8-1, 0*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(culture)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(culture)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(cultures)
- MDRV_VIDEO_UPDATE(cultures)
+ MCFG_VIDEO_START(cultures)
+ MCFG_VIDEO_UPDATE(cultures)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", (MCLK/1024)*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_OKIM6295_ADD("oki", (MCLK/1024)*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index 563de01da3a..a6580b0ad56 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -1064,60 +1064,60 @@ MACHINE_RESET( cvs )
static MACHINE_CONFIG_START( cvs, cvs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, 894886.25)
- MDRV_CPU_PROGRAM_MAP(cvs_main_cpu_map)
- MDRV_CPU_IO_MAP(cvs_main_cpu_io_map)
- MDRV_CPU_VBLANK_INT("screen", cvs_main_cpu_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650, 894886.25)
+ MCFG_CPU_PROGRAM_MAP(cvs_main_cpu_map)
+ MCFG_CPU_IO_MAP(cvs_main_cpu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", cvs_main_cpu_interrupt)
- MDRV_CPU_ADD("audiocpu", S2650, 894886.25)
- MDRV_CPU_PROGRAM_MAP(cvs_dac_cpu_map)
- MDRV_CPU_IO_MAP(cvs_dac_cpu_io_map)
+ MCFG_CPU_ADD("audiocpu", S2650, 894886.25)
+ MCFG_CPU_PROGRAM_MAP(cvs_dac_cpu_map)
+ MCFG_CPU_IO_MAP(cvs_dac_cpu_io_map)
- MDRV_CPU_ADD("speech", S2650, 894886.25)
- MDRV_CPU_PROGRAM_MAP(cvs_speech_cpu_map)
- MDRV_CPU_IO_MAP(cvs_speech_cpu_io_map)
+ MCFG_CPU_ADD("speech", S2650, 894886.25)
+ MCFG_CPU_PROGRAM_MAP(cvs_speech_cpu_map)
+ MCFG_CPU_IO_MAP(cvs_speech_cpu_io_map)
- MDRV_MACHINE_START(cvs)
- MDRV_MACHINE_RESET(cvs)
+ MCFG_MACHINE_START(cvs)
+ MCFG_MACHINE_RESET(cvs)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(cvs)
- MDRV_VIDEO_UPDATE(cvs)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(cvs)
+ MCFG_VIDEO_UPDATE(cvs)
- MDRV_GFXDECODE(cvs)
- MDRV_PALETTE_LENGTH((256+4)*8+8+1)
- MDRV_PALETTE_INIT(cvs)
+ MCFG_GFXDECODE(cvs)
+ MCFG_PALETTE_LENGTH((256+4)*8+8+1)
+ MCFG_PALETTE_INIT(cvs)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 30*8-1, 1*8, 32*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1000))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 30*8-1, 1*8, 32*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1000))
- MDRV_S2636_ADD("s2636_0", s2636_0_config)
- MDRV_S2636_ADD("s2636_1", s2636_1_config)
- MDRV_S2636_ADD("s2636_2", s2636_2_config)
+ MCFG_S2636_ADD("s2636_0", s2636_0_config)
+ MCFG_S2636_ADD("s2636_1", s2636_1_config)
+ MCFG_S2636_ADD("s2636_2", s2636_2_config)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- //MDRV_SOUND_ADD("dac1a", DAC, 0)
- //MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ //MCFG_SOUND_ADD("dac1a", DAC, 0)
+ //MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac3", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac3", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("tms", TMS5100, 640000)
- MDRV_SOUND_CONFIG(tms5100_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5100, 640000)
+ MCFG_SOUND_CONFIG(tms5100_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index b4d7582f7f5..00ce8ac03e4 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -432,90 +432,90 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( cyberbal, cyberbal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)ATARI_CLOCK_14MHz/4/4/16/16/14)
+ MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)ATARI_CLOCK_14MHz/4/4/16/16/14)
- MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(extra_map)
- MDRV_CPU_VBLANK_INT("lscreen", atarigen_video_int_gen) /* or is it "right?" */
+ MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(extra_map)
+ MCFG_CPU_VBLANK_INT("lscreen", atarigen_video_int_gen) /* or is it "right?" */
- MDRV_CPU_ADD("dac", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_68k_map)
- MDRV_CPU_PERIODIC_INT(cyberbal_sound_68k_irq_gen, 10000)
+ MCFG_CPU_ADD("dac", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(sound_68k_map)
+ MCFG_CPU_PERIODIC_INT(cyberbal_sound_68k_irq_gen, 10000)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(cyberbal)
- MDRV_MACHINE_RESET(cyberbal)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(cyberbal)
+ MCFG_MACHINE_RESET(cyberbal)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(interleaved)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(interleaved)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
- MDRV_VIDEO_START(cyberbal)
- MDRV_VIDEO_UPDATE(cyberbal)
+ MCFG_VIDEO_START(cyberbal)
+ MCFG_VIDEO_UPDATE(cyberbal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cyberbal2p, cyberbal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(cyberbal2p_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(cyberbal2p_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(cyberbal)
- MDRV_MACHINE_RESET(cyberbal2p)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(cyberbal)
+ MCFG_MACHINE_RESET(cyberbal2p)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(cyberbal)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(cyberbal)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
- MDRV_VIDEO_START(cyberbal2p)
- MDRV_VIDEO_UPDATE(cyberbal)
+ MCFG_VIDEO_START(cyberbal2p)
+ MCFG_VIDEO_UPDATE(cyberbal)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_ii_mono)
+ MCFG_FRAGMENT_ADD(jsa_ii_mono)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index b9c6fd1babb..c6fd512bc7c 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -837,54 +837,54 @@ static const y8950_interface y8950_config = {
};
static MACHINE_CONFIG_START( cybertnk, driver_device )
- MDRV_CPU_ADD("maincpu", M68000,20000000/2)
- MDRV_CPU_PROGRAM_MAP(master_mem)
- MDRV_CPU_VBLANK_INT("lscreen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,20000000/2)
+ MCFG_CPU_PROGRAM_MAP(master_mem)
+ MCFG_CPU_VBLANK_INT("lscreen", irq1_line_hold)
- MDRV_CPU_ADD("slave", M68000,20000000/2)
- MDRV_CPU_PROGRAM_MAP(slave_mem)
- MDRV_CPU_VBLANK_INT("lscreen", irq3_line_hold)
+ MCFG_CPU_ADD("slave", M68000,20000000/2)
+ MCFG_CPU_PROGRAM_MAP(slave_mem)
+ MCFG_CPU_VBLANK_INT("lscreen", irq3_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,3579500)
- MDRV_CPU_PROGRAM_MAP(sound_mem)
+ MCFG_CPU_ADD("audiocpu", Z80,3579500)
+ MCFG_CPU_PROGRAM_MAP(sound_mem)
- MDRV_QUANTUM_TIME(HZ(6000))//arbitrary value,needed to get the communication to work
+ MCFG_QUANTUM_TIME(HZ(6000))//arbitrary value,needed to get the communication to work
/* video hardware */
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_ADD("lscreen", 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, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("lscreen", 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, 0*8, 28*8-1)
- MDRV_SCREEN_ADD("rscreen", 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, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("rscreen", 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, 0*8, 28*8-1)
- MDRV_GFXDECODE(cybertnk)
- MDRV_PALETTE_LENGTH(0x4000)
+ MCFG_GFXDECODE(cybertnk)
+ MCFG_PALETTE_LENGTH(0x4000)
- MDRV_VIDEO_START(cybertnk)
- MDRV_VIDEO_UPDATE(cybertnk)
+ MCFG_VIDEO_START(cybertnk)
+ MCFG_VIDEO_UPDATE(cybertnk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ym1", Y8950, 3579500)
- MDRV_SOUND_CONFIG(y8950_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ym1", Y8950, 3579500)
+ MCFG_SOUND_CONFIG(y8950_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("ym2", Y8950, 3579500)
- MDRV_SOUND_CONFIG(y8950_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ym2", Y8950, 3579500)
+ MCFG_SOUND_CONFIG(y8950_config)
+ 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/cyclemb.c b/src/mame/drivers/cyclemb.c
index 3c815a64e38..21bb67ce00d 100644
--- a/src/mame/drivers/cyclemb.c
+++ b/src/mame/drivers/cyclemb.c
@@ -514,35 +514,35 @@ GFXDECODE_END
static MACHINE_CONFIG_START( cyclemb, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,18000000/4)
- MDRV_CPU_PROGRAM_MAP(cyclemb_map)
- MDRV_CPU_IO_MAP(cyclemb_io)
- MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,18000000/4)
+ MCFG_CPU_PROGRAM_MAP(cyclemb_map)
+ MCFG_CPU_IO_MAP(cyclemb_io)
+ MCFG_CPU_VBLANK_INT("screen",irq0_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,18000000/4)
- MDRV_CPU_PROGRAM_MAP(cyclemb_sound_map)
- MDRV_CPU_IO_MAP(cyclemb_sound_io)
+ MCFG_CPU_ADD("audiocpu",Z80,18000000/4)
+ MCFG_CPU_PROGRAM_MAP(cyclemb_sound_map)
+ MCFG_CPU_IO_MAP(cyclemb_sound_io)
/* 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(cyclemb)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cyclemb)
+ 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(cyclemb)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cyclemb)
- MDRV_VIDEO_START(cyclemb)
- MDRV_VIDEO_UPDATE(cyclemb)
+ MCFG_VIDEO_START(cyclemb)
+ MCFG_VIDEO_UPDATE(cyclemb)
- MDRV_MACHINE_RESET(cyclemb)
+ MCFG_MACHINE_RESET(cyclemb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 18000000/16)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 18000000/16)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c
index 3db1829ca4d..b8ed0aa1bc3 100644
--- a/src/mame/drivers/d9final.c
+++ b/src/mame/drivers/d9final.c
@@ -257,32 +257,32 @@ static MACHINE_RESET( d9final )
static MACHINE_CONFIG_START( d9final, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 24000000/4)/* ? MHz */
- MDRV_CPU_PROGRAM_MAP(d9final_map)
- MDRV_CPU_IO_MAP(d9final_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 24000000/4)/* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(d9final_map)
+ MCFG_CPU_IO_MAP(d9final_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET( d9final )
+ MCFG_MACHINE_RESET( d9final )
/* 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, 16, 256-16-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, 16, 256-16-1)
- MDRV_GFXDECODE(d9final)
- MDRV_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(all_black)
+ MCFG_GFXDECODE(d9final)
+ MCFG_PALETTE_LENGTH(0x400)
+ MCFG_PALETTE_INIT(all_black)
- MDRV_VIDEO_START(d9final)
- MDRV_VIDEO_UPDATE(d9final)
+ MCFG_VIDEO_START(d9final)
+ MCFG_VIDEO_UPDATE(d9final)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 771d9cbf55a..07f3fd2145e 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -503,49 +503,49 @@ static PALETTE_INIT( dacholer )
static MACHINE_CONFIG_START( dacholer, dacholer_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(snd_map)
- MDRV_CPU_IO_MAP(snd_io_map)
- MDRV_CPU_VBLANK_INT("screen",sound_irq)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(snd_map)
+ MCFG_CPU_IO_MAP(snd_io_map)
+ MCFG_CPU_VBLANK_INT("screen",sound_irq)
- MDRV_MACHINE_START(dacholer)
- MDRV_MACHINE_RESET(dacholer)
+ MCFG_MACHINE_START(dacholer)
+ MCFG_MACHINE_RESET(dacholer)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1-16)
- MDRV_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(dacholer)
- MDRV_GFXDECODE(dacholer)
+ MCFG_PALETTE_LENGTH(32)
+ MCFG_PALETTE_INIT(dacholer)
+ MCFG_GFXDECODE(dacholer)
- MDRV_VIDEO_START(dacholer)
- MDRV_VIDEO_UPDATE(dacholer)
+ MCFG_VIDEO_START(dacholer)
+ MCFG_VIDEO_UPDATE(dacholer)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay3", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("msm", MSM5205, 375000)
- MDRV_SOUND_CONFIG(msm_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("msm", MSM5205, 375000)
+ MCFG_SOUND_CONFIG(msm_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dai3wksi.c b/src/mame/drivers/dai3wksi.c
index 6afae28e41a..68c6763c33d 100644
--- a/src/mame/drivers/dai3wksi.c
+++ b/src/mame/drivers/dai3wksi.c
@@ -590,52 +590,52 @@ static MACHINE_RESET( dai3wksi )
static MACHINE_CONFIG_START( dai3wksi, dai3wksi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_10MHz/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(dai3wksi)
- MDRV_MACHINE_RESET(dai3wksi)
+ MCFG_MACHINE_START(dai3wksi)
+ MCFG_MACHINE_RESET(dai3wksi)
/* video hardware */
- MDRV_VIDEO_UPDATE(dai3wksi)
+ MCFG_VIDEO_UPDATE(dai3wksi)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(4, 251, 8, 247)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(4, 251, 8, 247)
+ MCFG_SCREEN_REFRESH_RATE(60)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
#if (USE_SAMPLES)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(dai3wksi_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(dai3wksi_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
#else
- MDRV_SOUND_ADD("ic76", SN76477, 0)
- MDRV_SOUND_CONFIG(dai3wksi_sn76477_ic76)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("ic76", SN76477, 0)
+ MCFG_SOUND_CONFIG(dai3wksi_sn76477_ic76)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MDRV_SOUND_ADD("ic77", SN76477, 0)
- MDRV_SOUND_CONFIG(dai3wksi_sn76477_ic77)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("ic77", SN76477, 0)
+ MCFG_SOUND_CONFIG(dai3wksi_sn76477_ic77)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MDRV_SOUND_ADD("ic78", SN76477, 0)
- MDRV_SOUND_CONFIG(dai3wksi_sn76477_ic78)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("ic78", SN76477, 0)
+ MCFG_SOUND_CONFIG(dai3wksi_sn76477_ic78)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MDRV_SOUND_ADD("ic79", SN76477, 0)
- MDRV_SOUND_CONFIG(dai3wksi_sn76477_ic79)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("ic79", SN76477, 0)
+ MCFG_SOUND_CONFIG(dai3wksi_sn76477_ic79)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MDRV_SOUND_ADD("ic80", SN76477, 0)
- MDRV_SOUND_CONFIG(dai3wksi_sn76477_ic80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("ic80", SN76477, 0)
+ MCFG_SOUND_CONFIG(dai3wksi_sn76477_ic80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MDRV_SOUND_ADD("ic81", SN76477, 0)
- MDRV_SOUND_CONFIG(dai3wksi_sn76477_ic81)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("ic81", SN76477, 0)
+ MCFG_SOUND_CONFIG(dai3wksi_sn76477_ic81)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
#endif
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index b85590b3f35..83d941337a5 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -233,34 +233,34 @@ static DRIVER_INIT(dambustr)
static MACHINE_CONFIG_START( dambustr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(dambustr_map)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(dambustr_map)
- MDRV_MACHINE_RESET(galaxold)
+ MCFG_MACHINE_RESET(galaxold)
- MDRV_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
- MDRV_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
+ MCFG_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
+ MCFG_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
- MDRV_TIMER_ADD("int_timer", galaxold_interrupt_timer)
+ MCFG_TIMER_ADD("int_timer", galaxold_interrupt_timer)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(16000.0/132/2)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(16000.0/132/2)
+ 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)
- MDRV_GFXDECODE(dambustr)
- MDRV_PALETTE_LENGTH(32+2+64+8) /* 32 for the characters, 2 for the bullets, 64 for the stars, 8 for the background */
+ MCFG_GFXDECODE(dambustr)
+ MCFG_PALETTE_LENGTH(32+2+64+8) /* 32 for the characters, 2 for the bullets, 64 for the stars, 8 for the background */
- MDRV_PALETTE_INIT(dambustr)
- MDRV_VIDEO_START(dambustr)
- MDRV_VIDEO_UPDATE(dambustr)
+ MCFG_PALETTE_INIT(dambustr)
+ MCFG_VIDEO_START(dambustr)
+ MCFG_VIDEO_UPDATE(dambustr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(galaxian_audio)
+ MCFG_FRAGMENT_ADD(galaxian_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index ba5c878a8c0..d581dfadca3 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -933,127 +933,127 @@ static MACHINE_RESET( darius )
static MACHINE_CONFIG_START( darius, darius_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(darius_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(darius_sound_map)
- MDRV_CPU_ADD("cpub", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius_cpub_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
+ MCFG_CPU_ADD("cpub", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(darius_cpub_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq4_line_hold)
- MDRV_CPU_ADD("adpcm", Z80,8000000/2) /* 4 MHz ? */ /* ADPCM player using MSM5205 */
- MDRV_CPU_PROGRAM_MAP(darius_sound2_map)
- MDRV_CPU_IO_MAP(darius_sound2_io_map)
+ MCFG_CPU_ADD("adpcm", Z80,8000000/2) /* 4 MHz ? */ /* ADPCM player using MSM5205 */
+ MCFG_CPU_PROGRAM_MAP(darius_sound2_map)
+ MCFG_CPU_IO_MAP(darius_sound2_io_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame ? */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame ? */
- MDRV_MACHINE_START(darius)
- MDRV_MACHINE_RESET(darius)
+ MCFG_MACHINE_START(darius)
+ MCFG_MACHINE_RESET(darius)
/* video hardware */
- MDRV_GFXDECODE(darius)
- MDRV_PALETTE_LENGTH(4096*2)
- MDRV_DEFAULT_LAYOUT(layout_darius)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1)
-
- MDRV_SCREEN_ADD("mscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1)
-
- MDRV_VIDEO_START(darius)
- MDRV_VIDEO_UPDATE(darius)
-
- MDRV_PC080SN_ADD("pc080sn", darius_pc080sn_intf)
+ MCFG_GFXDECODE(darius)
+ MCFG_PALETTE_LENGTH(4096*2)
+ MCFG_DEFAULT_LAYOUT(layout_darius)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1)
+
+ MCFG_SCREEN_ADD("mscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1)
+
+ MCFG_VIDEO_START(darius)
+ MCFG_VIDEO_UPDATE(darius)
+
+ MCFG_PC080SN_ADD("pc080sn", darius_pc080sn_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_interface_1)
- MDRV_SOUND_ROUTE(0, "filter0.0l", 0.08)
- MDRV_SOUND_ROUTE(0, "filter0.0r", 0.08)
- MDRV_SOUND_ROUTE(1, "filter0.1l", 0.08)
- MDRV_SOUND_ROUTE(1, "filter0.1r", 0.08)
- MDRV_SOUND_ROUTE(2, "filter0.2l", 0.08)
- MDRV_SOUND_ROUTE(2, "filter0.2r", 0.08)
- MDRV_SOUND_ROUTE(3, "filter0.3l", 0.60)
- MDRV_SOUND_ROUTE(3, "filter0.3r", 0.60)
-
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_interface_2)
- MDRV_SOUND_ROUTE(0, "filter1.0l", 0.08)
- MDRV_SOUND_ROUTE(0, "filter1.0r", 0.08)
- MDRV_SOUND_ROUTE(1, "filter1.1l", 0.08)
- MDRV_SOUND_ROUTE(1, "filter1.1r", 0.08)
- MDRV_SOUND_ROUTE(2, "filter1.2l", 0.08)
- MDRV_SOUND_ROUTE(2, "filter1.2r", 0.08)
- MDRV_SOUND_ROUTE(3, "filter1.3l", 0.60)
- MDRV_SOUND_ROUTE(3, "filter1.3r", 0.60)
-
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.l", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.r", 1.0)
-
- MDRV_SOUND_ADD("filter0.0l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter0.0r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("filter0.1l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter0.1r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("filter0.2l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter0.2r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("filter0.3l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter0.3r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("filter1.0l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter1.0r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("filter1.1l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter1.1r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("filter1.2l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter1.2r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("filter1.3l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter1.3r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("msm5205.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("msm5205.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", darius_tc0140syt_intf)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_interface_1)
+ MCFG_SOUND_ROUTE(0, "filter0.0l", 0.08)
+ MCFG_SOUND_ROUTE(0, "filter0.0r", 0.08)
+ MCFG_SOUND_ROUTE(1, "filter0.1l", 0.08)
+ MCFG_SOUND_ROUTE(1, "filter0.1r", 0.08)
+ MCFG_SOUND_ROUTE(2, "filter0.2l", 0.08)
+ MCFG_SOUND_ROUTE(2, "filter0.2r", 0.08)
+ MCFG_SOUND_ROUTE(3, "filter0.3l", 0.60)
+ MCFG_SOUND_ROUTE(3, "filter0.3r", 0.60)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_interface_2)
+ MCFG_SOUND_ROUTE(0, "filter1.0l", 0.08)
+ MCFG_SOUND_ROUTE(0, "filter1.0r", 0.08)
+ MCFG_SOUND_ROUTE(1, "filter1.1l", 0.08)
+ MCFG_SOUND_ROUTE(1, "filter1.1r", 0.08)
+ MCFG_SOUND_ROUTE(2, "filter1.2l", 0.08)
+ MCFG_SOUND_ROUTE(2, "filter1.2r", 0.08)
+ MCFG_SOUND_ROUTE(3, "filter1.3l", 0.60)
+ MCFG_SOUND_ROUTE(3, "filter1.3r", 0.60)
+
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.l", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.r", 1.0)
+
+ MCFG_SOUND_ADD("filter0.0l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter0.0r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("filter0.1l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter0.1r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("filter0.2l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter0.2r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("filter0.3l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter0.3r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("filter1.0l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter1.0r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("filter1.1l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter1.1r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("filter1.2l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter1.2r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("filter1.3l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter1.3r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("msm5205.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("msm5205.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", darius_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index e5824989095..5629854e78a 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -622,31 +622,31 @@ static INTERRUPT_GEN( darkhors )
}
static MACHINE_CONFIG_START( darkhors, driver_device )
- MDRV_CPU_ADD("maincpu", M68EC020, 12000000) // 36MHz/3 ??
- MDRV_CPU_PROGRAM_MAP(darkhors_map)
- MDRV_CPU_VBLANK_INT_HACK(darkhors,3)
+ MCFG_CPU_ADD("maincpu", M68EC020, 12000000) // 36MHz/3 ??
+ MCFG_CPU_PROGRAM_MAP(darkhors_map)
+ MCFG_CPU_VBLANK_INT_HACK(darkhors,3)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_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(0x190, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-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(0x190, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1)
- MDRV_GFXDECODE(darkhors)
- MDRV_PALETTE_LENGTH(0x10000)
+ MCFG_GFXDECODE(darkhors)
+ MCFG_PALETTE_LENGTH(0x10000)
- MDRV_VIDEO_START(darkhors)
- MDRV_VIDEO_UPDATE(darkhors)
+ MCFG_VIDEO_START(darkhors)
+ MCFG_VIDEO_UPDATE(darkhors)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 528000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 528000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -672,25 +672,25 @@ static VIDEO_UPDATE(jclub2)
}
static MACHINE_CONFIG_START( jclub2, driver_device )
- MDRV_CPU_ADD("maincpu", M68EC020, 12000000)
- MDRV_CPU_PROGRAM_MAP(jclub2_map)
- MDRV_CPU_VBLANK_INT_HACK(darkhors,3)
+ MCFG_CPU_ADD("maincpu", M68EC020, 12000000)
+ MCFG_CPU_PROGRAM_MAP(jclub2_map)
+ MCFG_CPU_VBLANK_INT_HACK(darkhors,3)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_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(0x190, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1)
-
- MDRV_GFXDECODE(jclub2)
- MDRV_PALETTE_LENGTH(0x10000)
-
- MDRV_VIDEO_START(jclub2)
- MDRV_VIDEO_UPDATE(jclub2)
+ 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(0x190, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1)
+
+ MCFG_GFXDECODE(jclub2)
+ MCFG_PALETTE_LENGTH(0x10000)
+
+ MCFG_VIDEO_START(jclub2)
+ MCFG_VIDEO_UPDATE(jclub2)
MACHINE_CONFIG_END
static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -728,37 +728,37 @@ static VIDEO_UPDATE(jclub2o)
}
static MACHINE_CONFIG_START( jclub2o, driver_device )
- MDRV_CPU_ADD("st0016",Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(st0016_mem)
- MDRV_CPU_IO_MAP(st0016_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("st0016",Z80,8000000)
+ MCFG_CPU_PROGRAM_MAP(st0016_mem)
+ MCFG_CPU_IO_MAP(st0016_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("maincpu", M68EC020, 12000000)
- MDRV_CPU_PROGRAM_MAP(jclub2o_map)
- //MDRV_CPU_VBLANK_INT_HACK(darkhors,3)
+ MCFG_CPU_ADD("maincpu", M68EC020, 12000000)
+ MCFG_CPU_PROGRAM_MAP(jclub2o_map)
+ //MCFG_CPU_VBLANK_INT_HACK(darkhors,3)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_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(0x190, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-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(0x190, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x190-1, 8, 0x100-8-1)
- MDRV_GFXDECODE(jclub2)
- MDRV_PALETTE_LENGTH(0x10000)
+ MCFG_GFXDECODE(jclub2)
+ MCFG_PALETTE_LENGTH(0x10000)
- MDRV_VIDEO_START(jclub2o)
- MDRV_VIDEO_UPDATE(jclub2o)
+ MCFG_VIDEO_START(jclub2o)
+ MCFG_VIDEO_UPDATE(jclub2o)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("stsnd", ST0016, 0)
- MDRV_SOUND_CONFIG(st0016_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("stsnd", ST0016, 0)
+ MCFG_SOUND_CONFIG(st0016_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index f843d73f0a9..511318748ff 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -242,35 +242,35 @@ static INTERRUPT_GEN( darkmist_interrupt )
static MACHINE_CONFIG_START( darkmist, darkmist_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(memmap)
- MDRV_CPU_VBLANK_INT_HACK(darkmist_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(memmap)
+ MCFG_CPU_VBLANK_INT_HACK(darkmist_interrupt,2)
- MDRV_CPU_ADD(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(t5182_map)
- MDRV_CPU_IO_MAP(t5182_io)
+ MCFG_CPU_ADD(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(t5182_map)
+ MCFG_CPU_IO_MAP(t5182_io)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
-
- MDRV_GFXDECODE(darkmist)
- MDRV_PALETTE_INIT(darkmist)
- MDRV_PALETTE_LENGTH(0x100*4)
- MDRV_VIDEO_START(darkmist)
- MDRV_VIDEO_UPDATE(darkmist)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
+
+ MCFG_GFXDECODE(darkmist)
+ MCFG_PALETTE_INIT(darkmist)
+ MCFG_PALETTE_LENGTH(0x100*4)
+ MCFG_VIDEO_START(darkmist)
+ MCFG_VIDEO_UPDATE(darkmist)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4) /* 3.579545 MHz */
- MDRV_SOUND_CONFIG(t5182_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 14318180/4) /* 3.579545 MHz */
+ MCFG_SOUND_CONFIG(t5182_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 16bf29e3efd..e3a206a0f92 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -230,45 +230,45 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( darkseal, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,12000000) /* Custom chip 59 */
- MDRV_CPU_PROGRAM_MAP(darkseal_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000,12000000) /* Custom chip 59 */
+ MCFG_CPU_PROGRAM_MAP(darkseal_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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)
- MDRV_GFXDECODE(darkseal)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(darkseal)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(darkseal)
- MDRV_VIDEO_UPDATE(darkseal)
+ MCFG_VIDEO_START(darkseal)
+ MCFG_VIDEO_UPDATE(darkseal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("ym1", YM2203, 32220000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.55)
- MDRV_SOUND_ROUTE(1, "mono", 0.55)
+ MCFG_SOUND_ADD("ym2", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.55)
+ MCFG_SOUND_ROUTE(1, "mono", 0.55)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 282985e60ae..538fd318de2 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -554,55 +554,55 @@ static const deco16ic_interface dassault_deco16ic_intf =
static MACHINE_CONFIG_START( dassault, dassault_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(dassault_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(dassault_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("sub", M68000, 14000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(dassault_sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 14000000) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(dassault_sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/8) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(8400)) /* 140 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(8400)) /* 140 CPU slices per frame */
/* 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_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(dassault)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(dassault)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_UPDATE(dassault)
+ MCFG_VIDEO_UPDATE(dassault)
- MDRV_DECO16IC_ADD("deco_custom", dassault_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", dassault_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, 32220000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ym2", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki1", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki1", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_OKIM6295_ADD("oki2", 2047848, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
+ MCFG_OKIM6295_ADD("oki2", 2047848, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END
/**********************************************************************************/
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 06add15e897..52045b6aca8 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -733,43 +733,43 @@ static MACHINE_RESET( dblewing )
static MACHINE_CONFIG_START( dblewing, dblewing_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000) /* DE102 */
- MDRV_CPU_PROGRAM_MAP(dblewing_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* DE102 */
+ MCFG_CPU_PROGRAM_MAP(dblewing_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(dblewing)
- MDRV_MACHINE_RESET(dblewing)
+ MCFG_MACHINE_START(dblewing)
+ MCFG_MACHINE_RESET(dblewing)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_GFXDECODE(dblewing)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(dblewing)
- MDRV_VIDEO_UPDATE(dblewing)
+ MCFG_VIDEO_UPDATE(dblewing)
- MDRV_DECO16IC_ADD("deco_custom", dblewing_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", dblewing_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_OKIM6295_ADD("oki", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_OKIM6295_ADD("oki", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 519ea618549..f3e274b5f58 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -372,50 +372,50 @@ static MACHINE_RESET( dbz )
static MACHINE_CONFIG_START( dbz, dbz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(dbz_map)
- MDRV_CPU_VBLANK_INT_HACK(dbz_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(dbz_map)
+ MCFG_CPU_VBLANK_INT_HACK(dbz_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(dbz_sound_map)
- MDRV_CPU_IO_MAP(dbz_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(dbz_sound_map)
+ MCFG_CPU_IO_MAP(dbz_sound_io_map)
- MDRV_MACHINE_START(dbz)
- MDRV_MACHINE_RESET(dbz)
+ MCFG_MACHINE_START(dbz)
+ MCFG_MACHINE_RESET(dbz)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- 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, 48*8-1, 0, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ 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, 48*8-1, 0, 32*8-1)
- MDRV_GFXDECODE(dbz)
+ MCFG_GFXDECODE(dbz)
- MDRV_VIDEO_START(dbz)
- MDRV_VIDEO_UPDATE(dbz)
- MDRV_PALETTE_LENGTH(0x4000/2)
+ MCFG_VIDEO_START(dbz)
+ MCFG_VIDEO_UPDATE(dbz)
+ MCFG_PALETTE_LENGTH(0x4000/2)
- MDRV_K056832_ADD("k056832", dbz_k056832_intf)
- MDRV_K053246_ADD("k053246", dbz_k053246_intf)
- MDRV_K053251_ADD("k053251")
- MDRV_K053936_ADD("k053936_1", dbz_k053936_intf)
- MDRV_K053936_ADD("k053936_2", dbz_k053936_intf)
+ MCFG_K056832_ADD("k056832", dbz_k056832_intf)
+ MCFG_K053246_ADD("k053246", dbz_k053246_intf)
+ MCFG_K053251_ADD("k053251")
+ MCFG_K053936_ADD("k053936_1", dbz_k053936_intf)
+ MCFG_K053936_ADD("k053936_2", dbz_k053936_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ 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/dcheese.c b/src/mame/drivers/dcheese.c
index bece398c023..8d56dda9319 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -408,44 +408,44 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( dcheese, dcheese_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MAIN_OSC)
- MDRV_CPU_PROGRAM_MAP(main_cpu_map)
- MDRV_CPU_VBLANK_INT("screen", dcheese_vblank)
+ MCFG_CPU_ADD("maincpu", M68000, MAIN_OSC)
+ MCFG_CPU_PROGRAM_MAP(main_cpu_map)
+ MCFG_CPU_VBLANK_INT("screen", dcheese_vblank)
- MDRV_CPU_ADD("audiocpu", M6809, SOUND_OSC/16)
- MDRV_CPU_PROGRAM_MAP(sound_cpu_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, 480) /* accurate for fredmem */
+ MCFG_CPU_ADD("audiocpu", M6809, SOUND_OSC/16)
+ MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, 480) /* accurate for fredmem */
- MDRV_MACHINE_START(dcheese)
+ MCFG_MACHINE_START(dcheese)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(360, 262) /* guess, need to see what the games write to the vid registers */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(360, 262) /* guess, need to see what the games write to the vid registers */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_LENGTH(65534)
+ MCFG_PALETTE_LENGTH(65534)
- MDRV_PALETTE_INIT(dcheese)
- MDRV_VIDEO_START(dcheese)
- MDRV_VIDEO_UPDATE(dcheese)
+ MCFG_PALETTE_INIT(dcheese)
+ MCFG_VIDEO_START(dcheese)
+ MCFG_VIDEO_UPDATE(dcheese)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("bsmt", BSMT2000, SOUND_OSC)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.2)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.2)
+ MCFG_SOUND_ADD("bsmt", BSMT2000, SOUND_OSC)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.2)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fredmem, dcheese )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 359, 0, 239)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 359, 0, 239)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index f105f985e96..179b1d30f43 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -246,27 +246,27 @@ GFXDECODE_END
static MACHINE_CONFIG_START( dcon, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dcon_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(dcon_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU_SOUND_SYSTEM_CPU(4000000) /* Perhaps 14318180/4? */
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(dcon)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(dcon)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(dcon)
- MDRV_VIDEO_UPDATE(dcon)
+ MCFG_VIDEO_START(dcon)
+ MCFG_VIDEO_UPDATE(dcon)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(4000000,1320000)
@@ -275,27 +275,27 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sdgndmps, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dcon_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(dcon_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU2_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
-
- MDRV_GFXDECODE(dcon)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(dcon)
- MDRV_VIDEO_UPDATE(sdgndmps)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
+
+ MCFG_GFXDECODE(dcon)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(dcon)
+ MCFG_VIDEO_UPDATE(sdgndmps)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(14318180/4,1320000)
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index c27f9c4ea80..7654ff9d3eb 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -245,36 +245,36 @@ static MACHINE_RESET( dday )
static MACHINE_CONFIG_START( dday, dday_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
- MDRV_CPU_PROGRAM_MAP(dday_map)
+ MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(dday_map)
- MDRV_MACHINE_START(dday)
- MDRV_MACHINE_RESET(dday)
+ MCFG_MACHINE_START(dday)
+ MCFG_MACHINE_RESET(dday)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*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(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(dday)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(dday)
+ MCFG_GFXDECODE(dday)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(dday)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_VIDEO_START(dday)
- MDRV_VIDEO_UPDATE(dday)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_START(dday)
+ MCFG_VIDEO_UPDATE(dday)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 5de83ede644..cc3c036a0e1 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -509,42 +509,42 @@ static PALETTE_INIT( ddayjlc )
static MACHINE_CONFIG_START( ddayjlc, ddayjlc_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/3)
- MDRV_CPU_PROGRAM_MAP(main_cpu)
- MDRV_CPU_VBLANK_INT("screen", ddayjlc_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/3)
+ MCFG_CPU_PROGRAM_MAP(main_cpu)
+ MCFG_CPU_VBLANK_INT("screen", ddayjlc_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 12000000/4)
- MDRV_CPU_PROGRAM_MAP(sound_cpu)
- MDRV_CPU_VBLANK_INT("screen", ddayjlc_snd_interrupt)
+ MCFG_CPU_ADD("audiocpu", Z80, 12000000/4)
+ MCFG_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_CPU_VBLANK_INT("screen", ddayjlc_snd_interrupt)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(ddayjlc)
- MDRV_MACHINE_RESET(ddayjlc)
+ MCFG_MACHINE_START(ddayjlc)
+ MCFG_MACHINE_RESET(ddayjlc)
/* 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)
+ 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)
- MDRV_GFXDECODE(ddayjlc)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(ddayjlc)
+ MCFG_GFXDECODE(ddayjlc)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_INIT(ddayjlc)
- MDRV_VIDEO_START(ddayjlc)
- MDRV_VIDEO_UPDATE(ddayjlc)
+ MCFG_VIDEO_START(ddayjlc)
+ MCFG_VIDEO_UPDATE(ddayjlc)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 12000000/6)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay1", AY8910, 12000000/6)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ay2", AY8910, 12000000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay2", AY8910, 12000000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index 023e41509d1..2dd54ca03da 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -615,35 +615,35 @@ static INTERRUPT_GEN( ddealer_interrupt )
static MACHINE_CONFIG_START( ddealer, ddealer_state )
- MDRV_CPU_ADD("maincpu" , M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(ddealer)
- MDRV_CPU_VBLANK_INT("screen", ddealer_interrupt)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, 90)//guess,controls music tempo,112 is way too fast
+ MCFG_CPU_ADD("maincpu" , M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(ddealer)
+ MCFG_CPU_VBLANK_INT("screen", ddealer_interrupt)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, 90)//guess,controls music tempo,112 is way too fast
// M50747 or NMK-110 8131 MCU
- MDRV_MACHINE_START(ddealer)
- MDRV_MACHINE_RESET(ddealer)
+ MCFG_MACHINE_START(ddealer)
+ MCFG_MACHINE_RESET(ddealer)
- MDRV_GFXDECODE(ddealer)
+ MCFG_GFXDECODE(ddealer)
- 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*8, 48*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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(ddealer)
- MDRV_VIDEO_UPDATE(ddealer)
+ MCFG_VIDEO_START(ddealer)
+ MCFG_VIDEO_UPDATE(ddealer)
- MDRV_TIMER_ADD_PERIODIC("coinsim", ddealer_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
+ MCFG_TIMER_ADD_PERIODIC("coinsim", ddealer_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 6000000 / 4)//guess
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2203, 6000000 / 4)//guess
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 87da50a66bd..eb9c5c08ed5 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -7713,60 +7713,60 @@ static MACHINE_START( sryudens )
static MACHINE_CONFIG_START( ddenlovr, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2)
- MDRV_CPU_PROGRAM_MAP(ddenlovr_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(ddenlovr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_MACHINE_START(ddenlovr)
- MDRV_MACHINE_RESET(ddenlovr)
+ MCFG_MACHINE_START(ddenlovr)
+ MCFG_MACHINE_RESET(ddenlovr)
/* 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(336, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-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(336, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(ddenlovr)
- MDRV_VIDEO_UPDATE(ddenlovr)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(ddenlovr)
+ MCFG_VIDEO_UPDATE(ddenlovr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 16) // or /8 ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 16) // or /8 ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ddenlovj, ddenlovr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ddenlovj_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ddenlovj_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ddenlovrk, ddenlovr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ddenlovrk_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ddenlovrk_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( akamaru, ddenlovr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(akamaru_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(akamaru_map)
MACHINE_CONFIG_END
@@ -7783,19 +7783,19 @@ static const ay8910_interface quiz365_ay8910_interface =
static MACHINE_CONFIG_DERIVED( quiz365, ddenlovr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(quiz365_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(quiz365_map)
- MDRV_SOUND_MODIFY("aysnd")
- MDRV_SOUND_CONFIG(quiz365_ay8910_interface)
+ MCFG_SOUND_MODIFY("aysnd")
+ MCFG_SOUND_CONFIG(quiz365_ay8910_interface)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nettoqc, ddenlovr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nettoqc_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(nettoqc_map)
MACHINE_CONFIG_END
/***************************************************************************
@@ -7835,47 +7835,47 @@ static INTERRUPT_GEN( rtc_irq )
static MACHINE_CONFIG_START( quizchq, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */
- MDRV_CPU_PROGRAM_MAP(quizchq_map)
- MDRV_CPU_IO_MAP(quizchq_portmap)
- MDRV_CPU_VBLANK_INT("screen", quizchq_irq)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */
+ MCFG_CPU_PROGRAM_MAP(quizchq_map)
+ MCFG_CPU_IO_MAP(quizchq_portmap)
+ MCFG_CPU_VBLANK_INT("screen", quizchq_irq)
- MDRV_MACHINE_START(rongrong)
- MDRV_MACHINE_RESET(ddenlovr)
+ MCFG_MACHINE_START(rongrong)
+ MCFG_MACHINE_RESET(ddenlovr)
/* 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(336, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-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(336, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(ddenlovr)
- MDRV_VIDEO_UPDATE(ddenlovr)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(ddenlovr)
+ MCFG_VIDEO_UPDATE(ddenlovr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz/8) // 3.579545Mhz, verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz/8) // 3.579545Mhz, verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
- MDRV_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, OKIM6295_PIN7_HIGH) // clock frequency verified 1.022MHz, pin 7 verified high
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, OKIM6295_PIN7_HIGH) // clock frequency verified 1.022MHz, pin 7 verified high
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rongrong, quizchq )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rongrong_map)
- MDRV_CPU_IO_MAP(rongrong_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rongrong_map)
+ MCFG_CPU_IO_MAP(rongrong_portmap)
MACHINE_CONFIG_END
/***************************************************************************
@@ -7909,47 +7909,47 @@ static INTERRUPT_GEN( mmpanic_irq )
static MACHINE_CONFIG_START( mmpanic, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(mmpanic_map)
- MDRV_CPU_IO_MAP(mmpanic_portmap)
- MDRV_CPU_VBLANK_INT("screen", mmpanic_irq)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(mmpanic_map)
+ MCFG_CPU_IO_MAP(mmpanic_portmap)
+ MCFG_CPU_VBLANK_INT("screen", mmpanic_irq)
- MDRV_CPU_ADD("soundcpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(mmpanic_sound_map)
- MDRV_CPU_IO_MAP(mmpanic_sound_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // NMI by main cpu
+ MCFG_CPU_ADD("soundcpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(mmpanic_sound_map)
+ MCFG_CPU_IO_MAP(mmpanic_sound_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) // NMI by main cpu
- MDRV_MACHINE_START(mmpanic)
- MDRV_MACHINE_RESET(ddenlovr)
+ MCFG_MACHINE_START(mmpanic)
+ MCFG_MACHINE_RESET(ddenlovr)
/* 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(336, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-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(336, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-16+5-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(mmpanic) // extra layers
- MDRV_VIDEO_UPDATE(ddenlovr)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(mmpanic) // extra layers
+ MCFG_VIDEO_UPDATE(ddenlovr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_OKIM6295_ADD("oki", 1022720, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1022720, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
@@ -7983,53 +7983,53 @@ static INTERRUPT_GEN( hanakanz_irq )
static MACHINE_CONFIG_START( hanakanz, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000) // TMPZ84C015BF-8
- MDRV_CPU_PROGRAM_MAP(hanakanz_map)
- MDRV_CPU_IO_MAP(hanakanz_portmap)
- MDRV_CPU_VBLANK_INT("screen", hanakanz_irq)
+ MCFG_CPU_ADD("maincpu",Z80,8000000) // TMPZ84C015BF-8
+ MCFG_CPU_PROGRAM_MAP(hanakanz_map)
+ MCFG_CPU_IO_MAP(hanakanz_portmap)
+ MCFG_CPU_VBLANK_INT("screen", hanakanz_irq)
- MDRV_MACHINE_START(hanakanz)
- MDRV_MACHINE_RESET(ddenlovr)
+ MCFG_MACHINE_START(hanakanz)
+ MCFG_MACHINE_RESET(ddenlovr)
/* 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(336, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-11-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(336, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-11-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around
- MDRV_VIDEO_UPDATE(ddenlovr)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around
+ MCFG_VIDEO_UPDATE(ddenlovr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", 1022720, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1022720, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hkagerou, hanakanz )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(hkagerou_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(hkagerou_portmap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjreach1, hanakanz )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjreach1_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(mjreach1_portmap)
MACHINE_CONFIG_END
@@ -8062,27 +8062,27 @@ static INTERRUPT_GEN( mjchuuka_irq )
static MACHINE_CONFIG_DERIVED( mjchuuka, hanakanz )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjchuuka_portmap)
- MDRV_CPU_VBLANK_INT("screen", mjchuuka_irq)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(mjchuuka_portmap)
+ MCFG_CPU_VBLANK_INT("screen", mjchuuka_irq)
- MDRV_SOUND_ADD("aysnd", AY8910, 1789772)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1789772)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( funkyfig, mmpanic )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(funkyfig_map)
- MDRV_CPU_IO_MAP(funkyfig_portmap)
- MDRV_CPU_VBLANK_INT("screen", mjchuuka_irq)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(funkyfig_map)
+ MCFG_CPU_IO_MAP(funkyfig_portmap)
+ MCFG_CPU_VBLANK_INT("screen", mjchuuka_irq)
- MDRV_MACHINE_START(funkyfig)
+ MCFG_MACHINE_START(funkyfig)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_IO_MAP(funkyfig_sound_portmap)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_IO_MAP(funkyfig_sound_portmap)
- MDRV_VIDEO_START(ddenlovr) // no extra layers?
+ MCFG_VIDEO_START(ddenlovr) // no extra layers?
MACHINE_CONFIG_END
@@ -8135,17 +8135,17 @@ static const ay8910_interface mjmyster_ay8910_interface =
static MACHINE_CONFIG_DERIVED( mjmyster, quizchq )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjmyster_map)
- MDRV_CPU_IO_MAP(mjmyster_portmap)
- MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
- MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjmyster_map)
+ MCFG_CPU_IO_MAP(mjmyster_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
+ MCFG_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
- MDRV_MACHINE_START(mjmyster)
+ MCFG_MACHINE_START(mjmyster)
- MDRV_SOUND_ADD("aysnd", AY8910, 3579545)
- MDRV_SOUND_CONFIG(mjmyster_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
+ MCFG_SOUND_CONFIG(mjmyster_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
@@ -8186,70 +8186,70 @@ static const ay8910_interface hginga_ay8910_interface =
static MACHINE_CONFIG_DERIVED( hginga, quizchq )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hginga_map)
- MDRV_CPU_IO_MAP(hginga_portmap)
- MDRV_CPU_VBLANK_INT("screen", hginga_irq)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hginga_map)
+ MCFG_CPU_IO_MAP(hginga_portmap)
+ MCFG_CPU_VBLANK_INT("screen", hginga_irq)
- MDRV_MACHINE_START(mjmyster)
+ MCFG_MACHINE_START(mjmyster)
- MDRV_SOUND_ADD("aysnd", AY8910, 3579545)
- MDRV_SOUND_CONFIG(hginga_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
+ MCFG_SOUND_CONFIG(hginga_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hgokou, quizchq )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hgokou_map)
- MDRV_CPU_IO_MAP(hgokou_portmap)
- MDRV_CPU_VBLANK_INT("screen", hginga_irq)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hgokou_map)
+ MCFG_CPU_IO_MAP(hgokou_portmap)
+ MCFG_CPU_VBLANK_INT("screen", hginga_irq)
- MDRV_MACHINE_START(mjmyster)
+ MCFG_MACHINE_START(mjmyster)
- MDRV_SOUND_ADD("aysnd", AY8910, 3579545)
- MDRV_SOUND_CONFIG(hginga_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
+ MCFG_SOUND_CONFIG(hginga_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjmywrld, mjmyster )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hginga_map)
- MDRV_CPU_IO_MAP(mjmywrld_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hginga_map)
+ MCFG_CPU_IO_MAP(mjmywrld_portmap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjmyuniv, quizchq )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjmyster_map)
- MDRV_CPU_IO_MAP(mjmyster_portmap)
- MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
- MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjmyster_map)
+ MCFG_CPU_IO_MAP(mjmyster_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
+ MCFG_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
- MDRV_MACHINE_START(mjmyster)
+ MCFG_MACHINE_START(mjmyster)
- MDRV_SOUND_ADD("aysnd", AY8910, 1789772)
- MDRV_SOUND_CONFIG(mjmyster_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1789772)
+ MCFG_SOUND_CONFIG(mjmyster_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjmyornt, quizchq )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjmyster_portmap)
- MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
- MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(mjmyster_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(mjmyster_irq, 2)
+ MCFG_CPU_PERIODIC_INT(rtc_nmi_irq, 1)
- MDRV_MACHINE_START(mjmyster)
+ MCFG_MACHINE_START(mjmyster)
- MDRV_SOUND_ADD("aysnd", AY8910, 1789772)
- MDRV_SOUND_CONFIG(mjmyster_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1789772)
+ MCFG_SOUND_CONFIG(mjmyster_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static INTERRUPT_GEN( mjflove_irq )
@@ -8274,17 +8274,17 @@ static INTERRUPT_GEN( mjflove_irq )
static MACHINE_CONFIG_DERIVED( mjflove, quizchq )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rongrong_map)
- MDRV_CPU_IO_MAP(mjflove_portmap)
- MDRV_CPU_VBLANK_INT_HACK(mjflove_irq, 2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rongrong_map)
+ MCFG_CPU_IO_MAP(mjflove_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(mjflove_irq, 2)
- MDRV_MACHINE_START(mjflove)
+ MCFG_MACHINE_START(mjflove)
- MDRV_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around
+ MCFG_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around
- MDRV_SOUND_ADD("aysnd", AY8910, 28636363/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 28636363/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/* It runs in IM 2, thus needs a vector on the data bus:
@@ -8297,50 +8297,50 @@ static INTERRUPT_GEN( hparadis_irq )
static MACHINE_CONFIG_DERIVED( hparadis, quizchq )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hparadis_map)
- MDRV_CPU_IO_MAP(hparadis_portmap)
- MDRV_CPU_VBLANK_INT("screen", hparadis_irq)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hparadis_map)
+ MCFG_CPU_IO_MAP(hparadis_portmap)
+ MCFG_CPU_VBLANK_INT("screen", hparadis_irq)
- MDRV_MACHINE_START(hparadis)
+ MCFG_MACHINE_START(hparadis)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jongtei, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // ?
- MDRV_CPU_PROGRAM_MAP(hanakanz_map)
- MDRV_CPU_IO_MAP(jongtei_portmap)
- MDRV_CPU_VBLANK_INT("screen", hanakanz_irq)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // ?
+ MCFG_CPU_PROGRAM_MAP(hanakanz_map)
+ MCFG_CPU_IO_MAP(jongtei_portmap)
+ MCFG_CPU_VBLANK_INT("screen", hanakanz_irq)
- MDRV_MACHINE_START(hanakanz)
- MDRV_MACHINE_RESET(ddenlovr)
+ MCFG_MACHINE_START(hanakanz)
+ MCFG_MACHINE_RESET(ddenlovr)
/* 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(336, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-11-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(336, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 5, 256-11-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around
- MDRV_VIDEO_UPDATE(ddenlovr)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around
+ MCFG_VIDEO_UPDATE(ddenlovr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
/***************************************************************************
@@ -8350,42 +8350,42 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sryudens, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2) // ?
- MDRV_CPU_PROGRAM_MAP(sryudens_map)
- MDRV_CPU_IO_MAP(sryudens_portmap)
- MDRV_CPU_VBLANK_INT("screen", mjchuuka_irq)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2) // ?
+ MCFG_CPU_PROGRAM_MAP(sryudens_map)
+ MCFG_CPU_IO_MAP(sryudens_portmap)
+ MCFG_CPU_VBLANK_INT("screen", mjchuuka_irq)
- MDRV_MACHINE_START(sryudens)
- MDRV_MACHINE_RESET(ddenlovr)
+ MCFG_MACHINE_START(sryudens)
+ MCFG_MACHINE_RESET(ddenlovr)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.8532) // VSync 60.8532Hz, HSync 15.2790kHz
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(336, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 0+5, 256-12-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.8532) // VSync 60.8532Hz, HSync 15.2790kHz
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(336, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 0+5, 256-12-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around
- MDRV_VIDEO_UPDATE(ddenlovr)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around
+ MCFG_VIDEO_UPDATE(ddenlovr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
/***************************************************************************
@@ -8395,39 +8395,39 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( daimyojn, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(hanakanz_map)
- MDRV_CPU_IO_MAP(daimyojn_portmap)
- MDRV_CPU_VBLANK_INT("screen", hanakanz_irq)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(hanakanz_map)
+ MCFG_CPU_IO_MAP(daimyojn_portmap)
+ MCFG_CPU_VBLANK_INT("screen", hanakanz_irq)
- MDRV_MACHINE_START(mjflove)
- MDRV_MACHINE_RESET(ddenlovr)
+ MCFG_MACHINE_START(mjflove)
+ MCFG_MACHINE_RESET(ddenlovr)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.7922) // HSync 15.4248kHz
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(336, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1-1, 1, 256-15-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.7922) // HSync 15.4248kHz
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(336, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 336-1-1, 1, 256-15-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around
- MDRV_VIDEO_UPDATE(ddenlovr)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(hanakanz) // blitter commands in the roms are shuffled around
+ MCFG_VIDEO_UPDATE(ddenlovr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_28_63636MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 6954a373a8b..06baa632cce 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -977,161 +977,161 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( ddragon, ddragon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
- MDRV_CPU_PROGRAM_MAP(ddragon_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
+ MCFG_CPU_PROGRAM_MAP(ddragon_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("sub", HD63701, MAIN_CLOCK / 2) /* 6 MHz / 4 internally */
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", HD63701, MAIN_CLOCK / 2) /* 6 MHz / 4 internally */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_ADD("soundcpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("soundcpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
+ MCFG_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
- MDRV_MACHINE_START(ddragon)
- MDRV_MACHINE_RESET(ddragon)
+ MCFG_MACHINE_START(ddragon)
+ MCFG_MACHINE_RESET(ddragon)
/* video hardware */
- MDRV_GFXDECODE(ddragon)
- MDRV_PALETTE_LENGTH(384)
+ MCFG_GFXDECODE(ddragon)
+ MCFG_PALETTE_LENGTH(384)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240)
- MDRV_VIDEO_START(ddragon)
- MDRV_VIDEO_UPDATE(ddragon)
+ MCFG_VIDEO_START(ddragon)
+ MCFG_VIDEO_UPDATE(ddragon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD("adpcm1", MSM5205, MAIN_CLOCK/32)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("adpcm1", MSM5205, MAIN_CLOCK/32)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("adpcm2", MSM5205, MAIN_CLOCK/32)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("adpcm2", MSM5205, MAIN_CLOCK/32)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ddragonb, ddragon )
/* basic machine hardware */
- MDRV_CPU_REPLACE("sub", M6809, MAIN_CLOCK / 8) /* 1.5Mhz */
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_REPLACE("sub", M6809, MAIN_CLOCK / 8) /* 1.5Mhz */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ddragonba, ddragon )
/* basic machine hardware */
- MDRV_CPU_REPLACE("sub", M6803, MAIN_CLOCK / 2) /* 6Mhz / 4 internally */
- MDRV_CPU_PROGRAM_MAP(ddragonba_sub_map)
- MDRV_CPU_IO_MAP(ddragonba_sub_portmap)
+ MCFG_CPU_REPLACE("sub", M6803, MAIN_CLOCK / 2) /* 6Mhz / 4 internally */
+ MCFG_CPU_PROGRAM_MAP(ddragonba_sub_map)
+ MCFG_CPU_IO_MAP(ddragonba_sub_portmap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ddragon6809, ddragon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(ddragon_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(ddragon_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 1.5 Mhz */
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", M6809, MAIN_CLOCK / 8) /* 1.5 Mhz */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_ADD("soundcpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("soundcpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
+ MCFG_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
- MDRV_MACHINE_START(ddragon)
- MDRV_MACHINE_RESET(ddragon)
+ MCFG_MACHINE_START(ddragon)
+ MCFG_MACHINE_RESET(ddragon)
/* video hardware */
- MDRV_GFXDECODE(ddragon)
- MDRV_PALETTE_LENGTH(384)
+ MCFG_GFXDECODE(ddragon)
+ MCFG_PALETTE_LENGTH(384)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240)
- MDRV_VIDEO_START(ddragon)
- MDRV_VIDEO_UPDATE(ddragon)
+ MCFG_VIDEO_START(ddragon)
+ MCFG_VIDEO_UPDATE(ddragon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD("adpcm1", MSM5205, MAIN_CLOCK/32)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("adpcm1", MSM5205, MAIN_CLOCK/32)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("adpcm2", MSM5205, MAIN_CLOCK/32)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("adpcm2", MSM5205, MAIN_CLOCK/32)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ddragon2, ddragon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
- MDRV_CPU_PROGRAM_MAP(dd2_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
+ MCFG_CPU_PROGRAM_MAP(dd2_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", ddragon_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK / 3) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(dd2_sub_map)
+ MCFG_CPU_ADD("sub", Z80, MAIN_CLOCK / 3) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(dd2_sub_map)
- MDRV_CPU_ADD("soundcpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(dd2_sound_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(dd2_sound_map)
- MDRV_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
+ MCFG_QUANTUM_TIME(HZ(60000)) /* heavy interleaving to sync up sprite<->main cpu's */
- MDRV_MACHINE_START(ddragon)
- MDRV_MACHINE_RESET(ddragon)
+ MCFG_MACHINE_START(ddragon)
+ MCFG_MACHINE_RESET(ddragon)
/* video hardware */
- MDRV_GFXDECODE(ddragon)
- MDRV_PALETTE_LENGTH(384)
+ MCFG_GFXDECODE(ddragon)
+ MCFG_PALETTE_LENGTH(384)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 0, 240)
- MDRV_VIDEO_START(ddragon)
- MDRV_VIDEO_UPDATE(ddragon)
+ MCFG_VIDEO_START(ddragon)
+ MCFG_VIDEO_UPDATE(ddragon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("fmsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( darktowr, ddragon )
/* basic machine hardware */
- MDRV_CPU_ADD("mcu", M68705,XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", M68705,XTAL_4MHz)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
/* video hardware */
MACHINE_CONFIG_END
@@ -1140,11 +1140,11 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( toffy, ddragon )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("sub")
+ MCFG_DEVICE_REMOVE("sub")
/* sound hardware */
- MDRV_DEVICE_REMOVE("adpcm1")
- MDRV_DEVICE_REMOVE("adpcm2")
+ MCFG_DEVICE_REMOVE("adpcm1")
+ MCFG_DEVICE_REMOVE("adpcm2")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 002a1e7c12d..b8961765455 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -593,63 +593,63 @@ static MACHINE_RESET( ddragon3 )
static MACHINE_CONFIG_START( ddragon3, ddragon3_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(ddragon3_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", ddragon3_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(ddragon3_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", ddragon3_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(ddragon3)
- MDRV_MACHINE_RESET(ddragon3)
+ MCFG_MACHINE_START(ddragon3)
+ MCFG_MACHINE_RESET(ddragon3)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
- MDRV_GFXDECODE(ddragon3)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(ddragon3)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(ddragon3)
- MDRV_VIDEO_UPDATE(ddragon3)
+ MCFG_VIDEO_START(ddragon3)
+ MCFG_VIDEO_UPDATE(ddragon3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ym2151", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ym2151", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.50)
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ddragon3b, ddragon3 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dd3b_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dd3b_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ctribe, ddragon3 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ctribe_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ctribe_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(ctribe_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(ctribe_sound_map)
- MDRV_VIDEO_UPDATE(ctribe)
+ MCFG_VIDEO_UPDATE(ctribe)
- MDRV_SOUND_MODIFY("ym2151")
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.20)
+ MCFG_SOUND_MODIFY("ym2151")
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.20)
- MDRV_SOUND_MODIFY("oki")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_SOUND_MODIFY("oki")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/ddribble.c b/src/mame/drivers/ddribble.c
index dc084ca71d4..911c5c7a133 100644
--- a/src/mame/drivers/ddribble.c
+++ b/src/mame/drivers/ddribble.c
@@ -285,59 +285,59 @@ static MACHINE_RESET( ddribble )
static MACHINE_CONFIG_START( ddribble, ddribble_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu0_map)
- MDRV_CPU_VBLANK_INT("screen", ddribble_interrupt_0)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu0_map)
+ MCFG_CPU_VBLANK_INT("screen", ddribble_interrupt_0)
- MDRV_CPU_ADD("cpu1", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", ddribble_interrupt_1)
+ MCFG_CPU_ADD("cpu1", M6809, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", ddribble_interrupt_1)
- MDRV_CPU_ADD("cpu2", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_ADD("cpu2", M6809, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
- MDRV_MACHINE_START(ddribble)
- MDRV_MACHINE_RESET(ddribble)
+ MCFG_MACHINE_START(ddribble)
+ MCFG_MACHINE_RESET(ddribble)
/* 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_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) */
-
- MDRV_GFXDECODE(ddribble)
- MDRV_PALETTE_LENGTH(64 + 256)
-
- MDRV_PALETTE_INIT(ddribble)
- MDRV_VIDEO_START(ddribble)
- MDRV_VIDEO_UPDATE(ddribble)
+ 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_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) */
+
+ MCFG_GFXDECODE(ddribble)
+ MCFG_PALETTE_LENGTH(64 + 256)
+
+ MCFG_PALETTE_INIT(ddribble)
+ MCFG_VIDEO_START(ddribble)
+ MCFG_VIDEO_UPDATE(ddribble)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "filter1", 0.25)
- MDRV_SOUND_ROUTE(1, "filter2", 0.25)
- MDRV_SOUND_ROUTE(2, "filter3", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.25)
-
- MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(vlm5030_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-
- MDRV_SOUND_ADD("filter1", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter2", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter3", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "filter1", 0.25)
+ MCFG_SOUND_ROUTE(1, "filter2", 0.25)
+ MCFG_SOUND_ROUTE(2, "filter3", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.25)
+
+ MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(vlm5030_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+
+ MCFG_SOUND_ADD("filter1", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter2", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter3", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c
index bf861fea8f8..ddfc36ba025 100644
--- a/src/mame/drivers/ddz.c
+++ b/src/mame/drivers/ddz.c
@@ -53,33 +53,33 @@ static const vr0_interface vr0_config =
static MACHINE_CONFIG_START( ddz, driver_device )
- MDRV_CPU_ADD("maincpu", SE3208, 43000000)
- MDRV_CPU_PROGRAM_MAP(ddz_mem)
- MDRV_CPU_VBLANK_INT("screen", ddz_interrupt)
+ MCFG_CPU_ADD("maincpu", SE3208, 43000000)
+ MCFG_CPU_PROGRAM_MAP(ddz_mem)
+ MCFG_CPU_VBLANK_INT("screen", ddz_interrupt)
- //MDRV_MACHINE_RESET(ddz)
+ //MCFG_MACHINE_RESET(ddz)
- //MDRV_NVRAM_ADD_0FILL("nvram")
+ //MCFG_NVRAM_ADD_0FILL("nvram")
- 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(ddz)
- MDRV_VIDEO_UPDATE(ddz)
- MDRV_VIDEO_EOF(ddz)
+ MCFG_VIDEO_START(ddz)
+ MCFG_VIDEO_UPDATE(ddz)
+ MCFG_VIDEO_EOF(ddz)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("vrender", VRENDER0, 0)
- MDRV_SOUND_CONFIG(vr0_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("vrender", VRENDER0, 0)
+ MCFG_SOUND_CONFIG(vr0_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 146e0edace5..a7fc096f67f 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -220,33 +220,33 @@ static INTERRUPT_GEN( deadang_interrupt )
static MACHINE_CONFIG_START( deadang, deadang_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2)
+ MCFG_CPU_ADD("maincpu", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(deadang_interrupt,2)
- MDRV_CPU_ADD("sub", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2)
+ MCFG_CPU_ADD("sub", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT_HACK(deadang_interrupt,2)
SEIBU3A_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4)
- MDRV_QUANTUM_TIME(HZ(60)) // the game stops working with higher interleave rates..
+ MCFG_QUANTUM_TIME(HZ(60)) // the game stops working with higher interleave rates..
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
-
- MDRV_GFXDECODE(deadang)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(deadang)
- MDRV_VIDEO_UPDATE(deadang)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
+
+ MCFG_GFXDECODE(deadang)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(deadang)
+ MCFG_VIDEO_UPDATE(deadang)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM2203_INTERFACE(XTAL_14_31818MHz/4)
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index cab02040121..0719986e4e2 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -1145,438 +1145,438 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( automat, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(automat_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(automat_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, 3000000)// ?
- MDRV_CPU_PROGRAM_MAP(automat_s_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000)// ?
+ MCFG_CPU_PROGRAM_MAP(automat_s_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(automat)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(automat)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0)
- MDRV_VIDEO_UPDATE(robocop)
+ MCFG_VIDEO_START(dec0)
+ MCFG_VIDEO_UPDATE(robocop)
/* sound hardware */
- MDRV_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.35)
-
- MDRV_SOUND_ADD("ym2", 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.35)
-
- MDRV_SOUND_ADD("msm", MSM5205, 384000/2)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ 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.35)
+
+ MCFG_SOUND_ADD("ym2", 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.35)
+
+ MCFG_SOUND_ADD("msm", MSM5205, 384000/2)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hbarrel, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(dec0_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(dec0_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
- MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MDRV_CPU_ADD("mcu", I8751, XTAL_8MHz)
- MDRV_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_IO_MAP(mcu_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(dec0)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(dec0)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0)
- MDRV_VIDEO_UPDATE(hbarrel)
+ MCFG_VIDEO_START(dec0)
+ MCFG_VIDEO_UPDATE(hbarrel)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
- 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.35)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.90)
+ MCFG_SOUND_ROUTE(1, "mono", 0.90)
+ MCFG_SOUND_ROUTE(2, "mono", 0.90)
+ MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( baddudes, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(dec0_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(dec0_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
- MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(dec0)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(dec0)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0)
- MDRV_VIDEO_UPDATE(baddudes)
+ MCFG_VIDEO_START(dec0)
+ MCFG_VIDEO_UPDATE(baddudes)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
- 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.35)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.90)
+ MCFG_SOUND_ROUTE(1, "mono", 0.90)
+ MCFG_SOUND_ROUTE(2, "mono", 0.90)
+ MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( birdtry, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(dec0_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(dec0_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
- MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(dec0)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(dec0)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0)
- MDRV_VIDEO_UPDATE(birdtry)
+ MCFG_VIDEO_START(dec0)
+ MCFG_VIDEO_UPDATE(birdtry)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
- 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.35)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.90)
+ MCFG_SOUND_ROUTE(1, "mono", 0.90)
+ MCFG_SOUND_ROUTE(2, "mono", 0.90)
+ MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( robocop, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(dec0_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(dec0_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MDRV_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16)
- MDRV_CPU_PROGRAM_MAP(robocop_sub_map)
+ MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16)
+ MCFG_CPU_PROGRAM_MAP(robocop_sub_map)
- MDRV_QUANTUM_TIME(HZ(3000)) /* Interleave between HuC6280 & 68000 */
+ MCFG_QUANTUM_TIME(HZ(3000)) /* Interleave between HuC6280 & 68000 */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(dec0)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(dec0)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0)
- MDRV_VIDEO_UPDATE(robocop)
+ MCFG_VIDEO_START(dec0)
+ MCFG_VIDEO_UPDATE(robocop)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
- 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.35)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.90)
+ MCFG_SOUND_ROUTE(1, "mono", 0.90)
+ MCFG_SOUND_ROUTE(2, "mono", 0.90)
+ MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( robocopb, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(dec0_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(dec0_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(dec0)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(dec0)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0)
- MDRV_VIDEO_UPDATE(robocop)
+ MCFG_VIDEO_START(dec0)
+ MCFG_VIDEO_UPDATE(robocop)
/* 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.35)
+ 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.35)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hippodrm, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(dec0_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(dec0_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz / 8)
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MDRV_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16)
- MDRV_CPU_PROGRAM_MAP(hippodrm_sub_map)
+ MCFG_CPU_ADD("sub", H6280, XTAL_21_4772MHz / 16)
+ MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map)
- MDRV_QUANTUM_TIME(HZ(300)) /* Interleave between H6280 & 68000 */
+ MCFG_QUANTUM_TIME(HZ(300)) /* Interleave between H6280 & 68000 */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(dec0)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(dec0)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0)
- MDRV_VIDEO_UPDATE(hippodrm)
+ MCFG_VIDEO_START(dec0)
+ MCFG_VIDEO_UPDATE(hippodrm)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
- 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.35)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz / 8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.90)
+ MCFG_SOUND_ROUTE(1, "mono", 0.90)
+ MCFG_SOUND_ROUTE(2, "mono", 0.90)
+ MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz / 4)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( slyspy, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MDRV_CPU_PROGRAM_MAP(slyspy_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_CPU_PROGRAM_MAP(slyspy_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slyspy_s_map)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(slyspy_s_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(dec0)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(dec0)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0_nodma)
- MDRV_VIDEO_UPDATE(slyspy)
+ MCFG_VIDEO_START(dec0_nodma)
+ MCFG_VIDEO_UPDATE(slyspy)
/* 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.35)
+ 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.35)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812b_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812b_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( secretab, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MDRV_CPU_PROGRAM_MAP(secretab_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_CPU_PROGRAM_MAP(secretab_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
/* z80 */
-// MDRV_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
-// MDRV_CPU_PROGRAM_MAP(slyspy_s_map)
+// MCFG_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
+// MCFG_CPU_PROGRAM_MAP(slyspy_s_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(secretab)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(secretab)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0_nodma)
- MDRV_VIDEO_UPDATE(robocop)
+ MCFG_VIDEO_START(dec0_nodma)
+ MCFG_VIDEO_UPDATE(robocop)
/* 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.35)
+ 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.35)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812b_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812b_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( midres, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MDRV_CPU_PROGRAM_MAP(midres_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_CPU_PROGRAM_MAP(midres_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", H6280, XTAL_24MHz/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(midres_s_map)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL_24MHz/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(midres_s_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.41)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.41)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 57.41 Hz, 529us Vblank */)
+ 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)
- MDRV_GFXDECODE(midres)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(midres)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(dec0_nodma)
- MDRV_VIDEO_UPDATE(midres)
+ MCFG_VIDEO_START(dec0_nodma)
+ MCFG_VIDEO_UPDATE(midres)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16) /* 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.35)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "mono", 0.90)
+ MCFG_SOUND_ROUTE(1, "mono", 0.90)
+ MCFG_SOUND_ROUTE(2, "mono", 0.90)
+ MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_24MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812b_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_24MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812b_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb (1mhz crystal) */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.40)
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb (1mhz crystal) */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( midresb, midres )
- MDRV_CPU_REPLACE("audiocpu", M6502, 1500000 )
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_REPLACE("audiocpu", M6502, 1500000 )
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MDRV_SOUND_MODIFY("ym2")
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_MODIFY("ym2")
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 4329792860d..142177c0289 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -1976,426 +1976,426 @@ static MACHINE_RESET( dec8 )
static MACHINE_CONFIG_START( cobracom, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(cobra_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(cobra_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec8_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(cobracom)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(cobracom)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(cobracom)
- MDRV_VIDEO_UPDATE(cobracom)
+ MCFG_VIDEO_START(cobracom)
+ MCFG_VIDEO_UPDATE(cobracom)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.53)
- MDRV_SOUND_ROUTE(1, "mono", 0.53)
- MDRV_SOUND_ROUTE(2, "mono", 0.53)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.53)
+ MCFG_SOUND_ROUTE(1, "mono", 0.53)
+ MCFG_SOUND_ROUTE(2, "mono", 0.53)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ghostb, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 3000000*4)
- MDRV_CPU_PROGRAM_MAP(meikyuh_map)
- MDRV_CPU_VBLANK_INT("screen", gondo_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4)
+ MCFG_CPU_PROGRAM_MAP(meikyuh_map)
+ MCFG_CPU_VBLANK_INT("screen", gondo_interrupt)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec8_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
- MDRV_CPU_ADD("mcu", I8751, 3000000*4)
- MDRV_CPU_IO_MAP(dec8_mcu_io_map)
+ MCFG_CPU_ADD("mcu", I8751, 3000000*4)
+ MCFG_CPU_IO_MAP(dec8_mcu_io_map)
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(ghostb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ghostb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(ghostb)
- MDRV_VIDEO_START(ghostb)
- MDRV_VIDEO_EOF(dec8)
- MDRV_VIDEO_UPDATE(ghostb)
+ MCFG_PALETTE_INIT(ghostb)
+ MCFG_VIDEO_START(ghostb)
+ MCFG_VIDEO_EOF(dec8)
+ MCFG_VIDEO_UPDATE(ghostb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.23)
- MDRV_SOUND_ROUTE(1, "mono", 0.23)
- MDRV_SOUND_ROUTE(2, "mono", 0.23)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.23)
+ MCFG_SOUND_ROUTE(1, "mono", 0.23)
+ MCFG_SOUND_ROUTE(2, "mono", 0.23)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( srdarwin, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809,2000000) /* MC68A09EP */
- MDRV_CPU_PROGRAM_MAP(srdarwin_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6809,2000000) /* MC68A09EP */
+ MCFG_CPU_PROGRAM_MAP(srdarwin_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dec8_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(srdarwin)
- MDRV_PALETTE_LENGTH(144)
+ MCFG_GFXDECODE(srdarwin)
+ MCFG_PALETTE_LENGTH(144)
- MDRV_VIDEO_START(srdarwin)
- MDRV_VIDEO_UPDATE(srdarwin)
+ MCFG_VIDEO_START(srdarwin)
+ MCFG_VIDEO_UPDATE(srdarwin)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.23)
- MDRV_SOUND_ROUTE(1, "mono", 0.23)
- MDRV_SOUND_ROUTE(2, "mono", 0.23)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.23)
+ MCFG_SOUND_ROUTE(1, "mono", 0.23)
+ MCFG_SOUND_ROUTE(2, "mono", 0.23)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gondo, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */
- MDRV_CPU_PROGRAM_MAP(gondo_map)
- MDRV_CPU_VBLANK_INT("screen", gondo_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */
+ MCFG_CPU_PROGRAM_MAP(gondo_map)
+ MCFG_CPU_VBLANK_INT("screen", gondo_interrupt)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(oscar_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
- MDRV_CPU_ADD("mcu", I8751, XTAL_8MHz)
- MDRV_CPU_IO_MAP(dec8_mcu_io_map)
+ MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz)
+ MCFG_CPU_IO_MAP(dec8_mcu_io_map)
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(gondo)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(gondo)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(gondo)
- MDRV_VIDEO_EOF(dec8)
- MDRV_VIDEO_UPDATE(gondo)
+ MCFG_VIDEO_START(gondo)
+ MCFG_VIDEO_EOF(dec8)
+ MCFG_VIDEO_UPDATE(gondo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.23)
- MDRV_SOUND_ROUTE(1, "mono", 0.23)
- MDRV_SOUND_ROUTE(2, "mono", 0.23)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.23)
+ MCFG_SOUND_ROUTE(1, "mono", 0.23)
+ MCFG_SOUND_ROUTE(2, "mono", 0.23)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD("ym2", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( oscar, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(oscar_map)
- MDRV_CPU_VBLANK_INT("screen", oscar_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(oscar_map)
+ MCFG_CPU_VBLANK_INT("screen", oscar_interrupt)
- MDRV_CPU_ADD("sub", HD6309, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(oscar_sub_map)
+ MCFG_CPU_ADD("sub", HD6309, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(oscar_sub_map)
- MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz/8)
- MDRV_CPU_PROGRAM_MAP(oscar_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz/8)
+ MCFG_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
- MDRV_QUANTUM_TIME(HZ(2400)) /* 40 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(2400)) /* 40 CPU slices per frame */
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(oscar)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(oscar)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(oscar)
- MDRV_VIDEO_UPDATE(oscar)
+ MCFG_VIDEO_START(oscar)
+ MCFG_VIDEO_UPDATE(oscar)
/* 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.23)
- MDRV_SOUND_ROUTE(1, "mono", 0.23)
- MDRV_SOUND_ROUTE(2, "mono", 0.23)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "mono", 0.23)
+ MCFG_SOUND_ROUTE(1, "mono", 0.23)
+ MCFG_SOUND_ROUTE(2, "mono", 0.23)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( lastmisn, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(lastmisn_map)
+ MCFG_CPU_ADD("maincpu", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(lastmisn_map)
- MDRV_CPU_ADD("sub", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(lastmisn_sub_map)
+ MCFG_CPU_ADD("sub", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(lastmisn_sub_map)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(ym3526_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(ym3526_s_map)
/* NMIs are caused by the main CPU */
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(shackled)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(shackled)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(lastmisn)
- MDRV_VIDEO_UPDATE(lastmisn)
+ MCFG_VIDEO_START(lastmisn)
+ MCFG_VIDEO_UPDATE(lastmisn)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.23)
- MDRV_SOUND_ROUTE(1, "mono", 0.23)
- MDRV_SOUND_ROUTE(2, "mono", 0.23)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.23)
+ MCFG_SOUND_ROUTE(1, "mono", 0.23)
+ MCFG_SOUND_ROUTE(2, "mono", 0.23)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD("ym2", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( shackled, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(shackled_map)
+ MCFG_CPU_ADD("maincpu", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(shackled_map)
- MDRV_CPU_ADD("sub", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(shackled_sub_map)
+ MCFG_CPU_ADD("sub", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(shackled_sub_map)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(ym3526_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(ym3526_s_map)
/* NMIs are caused by the main CPU */
- MDRV_QUANTUM_TIME(HZ(4800))
+ MCFG_QUANTUM_TIME(HZ(4800))
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(shackled)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(shackled)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(shackled)
- MDRV_VIDEO_UPDATE(shackled)
+ MCFG_VIDEO_START(shackled)
+ MCFG_VIDEO_UPDATE(shackled)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.23)
- MDRV_SOUND_ROUTE(1, "mono", 0.23)
- MDRV_SOUND_ROUTE(2, "mono", 0.23)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.23)
+ MCFG_SOUND_ROUTE(1, "mono", 0.23)
+ MCFG_SOUND_ROUTE(2, "mono", 0.23)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD("ym2", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( csilver, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(csilver_map)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(csilver_map)
- MDRV_CPU_ADD("sub", M6809, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(csilver_sub_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("sub", M6809, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(csilver_sub_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6502, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(csilver_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(csilver_s_map)
/* NMIs are caused by the main CPU */
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(shackled)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(shackled)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(lastmisn)
- MDRV_VIDEO_UPDATE(lastmisn)
+ MCFG_VIDEO_START(lastmisn)
+ MCFG_VIDEO_UPDATE(lastmisn)
/* 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.23)
- MDRV_SOUND_ROUTE(1, "mono", 0.23)
- MDRV_SOUND_ROUTE(2, "mono", 0.23)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "mono", 0.23)
+ MCFG_SOUND_ROUTE(1, "mono", 0.23)
+ MCFG_SOUND_ROUTE(2, "mono", 0.23)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.88)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.88)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( garyoret, dec8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */
- MDRV_CPU_PROGRAM_MAP(garyoret_map)
- MDRV_CPU_VBLANK_INT("screen", gondo_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */
+ MCFG_CPU_PROGRAM_MAP(garyoret_map)
+ MCFG_CPU_VBLANK_INT("screen", gondo_interrupt)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(oscar_s_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
- MDRV_MACHINE_START(dec8)
- MDRV_MACHINE_RESET(dec8)
+ MCFG_MACHINE_START(dec8)
+ MCFG_MACHINE_RESET(dec8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 58Hz, 529ms Vblank duration */)
+ 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)
- MDRV_GFXDECODE(gondo)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(gondo)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(garyoret)
- MDRV_VIDEO_EOF(dec8)
- MDRV_VIDEO_UPDATE(garyoret)
+ MCFG_VIDEO_START(garyoret)
+ MCFG_VIDEO_EOF(dec8)
+ MCFG_VIDEO_UPDATE(garyoret)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.23)
- MDRV_SOUND_ROUTE(1, "mono", 0.23)
- MDRV_SOUND_ROUTE(2, "mono", 0.23)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.23)
+ MCFG_SOUND_ROUTE(1, "mono", 0.23)
+ MCFG_SOUND_ROUTE(2, "mono", 0.23)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MDRV_SOUND_ADD("ym2", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index fc25be4a1b6..0b327923acd 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -404,76 +404,76 @@ static const deco16ic_interface deco156_deco16ic_intf =
static MACHINE_CONFIG_START( hvysmsh, deco156_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
- MDRV_CPU_PROGRAM_MAP(hvysmsh_map)
- MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
+ MCFG_CPU_PROGRAM_MAP(hvysmsh_map)
+ MCFG_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(hvysmsh)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(hvysmsh)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(wcvol95)
- MDRV_VIDEO_UPDATE(wcvol95)
+ MCFG_VIDEO_START(wcvol95)
+ MCFG_VIDEO_UPDATE(wcvol95)
- MDRV_DECO16IC_ADD("deco_custom", deco156_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", deco156_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", 28000000/28, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 28000000/28, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 28000000/14, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_OKIM6295_ADD("oki2", 28000000/14, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wcvol95, deco156_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
- MDRV_CPU_PROGRAM_MAP(wcvol95_map)
- MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
+ MCFG_CPU_PROGRAM_MAP(wcvol95_map)
+ MCFG_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(hvysmsh)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(hvysmsh)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(wcvol95)
- MDRV_VIDEO_UPDATE(wcvol95)
+ MCFG_VIDEO_START(wcvol95)
+ MCFG_VIDEO_UPDATE(wcvol95)
- MDRV_DECO16IC_ADD("deco_custom", deco156_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", deco156_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index a9ade3d79a2..a2d967c8bcf 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1658,323 +1658,323 @@ static INTERRUPT_GEN( tattass_snd_interrupt )
static MACHINE_CONFIG_START( captaven, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, XTAL_28MHz/4) /* verified on pcb (Data East 101 custom)*/
- MDRV_CPU_PROGRAM_MAP(captaven_map)
- MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz/4) /* verified on pcb (Data East 101 custom)*/
+ MCFG_CPU_PROGRAM_MAP(captaven_map)
+ MCFG_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4/3) /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4/3) /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_RESET(deco32)
+ MCFG_MACHINE_RESET(deco32)
- MDRV_TIMER_ADD("int_timer", interrupt_gen)
+ MCFG_TIMER_ADD("int_timer", interrupt_gen)
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(42*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(42*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(captaven)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(captaven)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(captaven)
- MDRV_VIDEO_EOF(captaven)
- MDRV_VIDEO_UPDATE(captaven)
+ MCFG_VIDEO_START(captaven)
+ MCFG_VIDEO_EOF(captaven)
+ MCFG_VIDEO_UPDATE(captaven)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_32_22MHz/9) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.42)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.42)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_32_22MHz/9) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MDRV_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fghthist, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(fghthist_map)
- MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
+ MCFG_CPU_PROGRAM_MAP(fghthist_map)
+ MCFG_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(42*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(42*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(fghthist)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(fghthist)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(fghthist)
- MDRV_VIDEO_UPDATE(fghthist)
+ MCFG_VIDEO_START(fghthist)
+ MCFG_VIDEO_UPDATE(fghthist)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.42)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.42)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fghthsta, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(fghthsta_memmap)
- MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
+ MCFG_CPU_PROGRAM_MAP(fghthsta_memmap)
+ MCFG_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(42*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(42*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(fghthist)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(fghthist)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(fghthist)
- MDRV_VIDEO_UPDATE(fghthist)
+ MCFG_VIDEO_START(fghthist)
+ MCFG_VIDEO_UPDATE(fghthist)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.42)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.42)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dragngun, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(dragngun_map)
- MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
+ MCFG_CPU_PROGRAM_MAP(dragngun_map)
+ MCFG_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_RESET(deco32)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_RESET(deco32)
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_TIMER_ADD("int_timer", interrupt_gen)
+ MCFG_TIMER_ADD("int_timer", interrupt_gen)
/* 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_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(42*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(42*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(dragngun)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(dragngun)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(dragngun)
- MDRV_VIDEO_UPDATE(dragngun)
- MDRV_VIDEO_EOF(dragngun)
+ MCFG_VIDEO_START(dragngun)
+ MCFG_VIDEO_UPDATE(dragngun)
+ MCFG_VIDEO_EOF(dragngun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.42)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.42)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
- MDRV_OKIM6295_ADD("oki3", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki3", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( lockload, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000/4)
- MDRV_CPU_PROGRAM_MAP(lockload_map)
- MDRV_CPU_VBLANK_INT_HACK(deco32_vbl_interrupt,2) // From 2
+ MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
+ MCFG_CPU_PROGRAM_MAP(lockload_map)
+ MCFG_CPU_VBLANK_INT_HACK(deco32_vbl_interrupt,2) // From 2
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_RESET(deco32)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_RESET(deco32)
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_TIMER_ADD("int_timer", interrupt_gen)
+ MCFG_TIMER_ADD("int_timer", interrupt_gen)
/* 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_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(42*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(42*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(dragngun)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(dragngun)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(lockload)
- MDRV_VIDEO_UPDATE(dragngun)
- MDRV_VIDEO_EOF(dragngun)
+ MCFG_VIDEO_START(lockload)
+ MCFG_VIDEO_UPDATE(dragngun)
+ MCFG_VIDEO_EOF(dragngun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.42)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.42)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
- MDRV_OKIM6295_ADD("oki3", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki3", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tattass, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
- MDRV_CPU_PROGRAM_MAP(tattass_map)
- MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
+ MCFG_CPU_PROGRAM_MAP(tattass_map)
+ MCFG_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_CPU_ADD("audiocpu", M6809, 2000000)
- MDRV_CPU_PROGRAM_MAP(tattass_sound_map)
- MDRV_CPU_PERIODIC_INT(tattass_snd_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */
+ MCFG_CPU_ADD("audiocpu", M6809, 2000000)
+ MCFG_CPU_PROGRAM_MAP(tattass_sound_map)
+ MCFG_CPU_PERIODIC_INT(tattass_snd_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */
- MDRV_EEPROM_ADD("eeprom", eeprom_interface_tattass)
+ MCFG_EEPROM_ADD("eeprom", eeprom_interface_tattass)
/* 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_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(42*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(42*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tattass)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(tattass)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nslasher)
- MDRV_VIDEO_UPDATE(nslasher)
+ MCFG_VIDEO_START(nslasher)
+ MCFG_VIDEO_UPDATE(nslasher)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("bsmt", BSMT2000, 24000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("bsmt", BSMT2000, 24000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( nslasher, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28322000/4)
- MDRV_CPU_PROGRAM_MAP(nslasher_map)
- MDRV_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, 28322000/4)
+ MCFG_CPU_PROGRAM_MAP(nslasher_map)
+ MCFG_CPU_VBLANK_INT("screen", deco32_vbl_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 32220000/9)
- MDRV_CPU_PROGRAM_MAP(nslasher_sound)
- MDRV_CPU_IO_MAP(nslasher_io_sound)
+ MCFG_CPU_ADD("audiocpu", Z80, 32220000/9)
+ MCFG_CPU_PROGRAM_MAP(nslasher_sound)
+ MCFG_CPU_IO_MAP(nslasher_io_sound)
- MDRV_QUANTUM_TIME(HZ(6000)) /* to improve main<->audio comms */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* to improve main<->audio comms */
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(42*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(42*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(nslasher)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nslasher)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nslasher)
- MDRV_VIDEO_UPDATE(nslasher)
+ MCFG_VIDEO_START(nslasher)
+ MCFG_VIDEO_UPDATE(nslasher)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_interface_nslasher)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_interface_nslasher)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
MACHINE_CONFIG_END
/**********************************************************************************/
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index 1b7453d6b9c..4a46c87e759 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -503,48 +503,48 @@ static MACHINE_START( rblaster )
static MACHINE_CONFIG_START( rblaster, deco_ld_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M6502,8000000/2)
- MDRV_CPU_PROGRAM_MAP(rblaster_map)
-// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
- MDRV_CPU_VBLANK_INT("screen",nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu",M6502,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(rblaster_map)
+// MCFG_CPU_VBLANK_INT("screen",irq0_line_hold)
+ MCFG_CPU_VBLANK_INT("screen",nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu",M6502,8000000/2)
- MDRV_CPU_PROGRAM_MAP(rblaster_sound_map)
-// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold) //test
- MDRV_CPU_PERIODIC_INT(sound_interrupt, 640)
+ MCFG_CPU_ADD("audiocpu",M6502,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(rblaster_sound_map)
+// MCFG_CPU_VBLANK_INT("screen",irq0_line_hold) //test
+ MCFG_CPU_PERIODIC_INT(sound_interrupt, 640)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound") //Sony LDP-1000A, is it truly compatible with the Pioneer?
- MDRV_LASERDISC_OVERLAY(rblaster, 256, 256, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound") //Sony LDP-1000A, is it truly compatible with the Pioneer?
+ MCFG_LASERDISC_OVERLAY(rblaster, 256, 256, BITMAP_FORMAT_INDEXED16)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(rblaster)
- MDRV_PALETTE_LENGTH(512)
- MDRV_MACHINE_START(rblaster)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_GFXDECODE(rblaster)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_MACHINE_START(rblaster)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- 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( begas, rblaster )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(begas_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(begas_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cobra, rblaster )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cobra_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cobra_map)
- MDRV_DEVICE_REMOVE("audiocpu")
+ MCFG_DEVICE_REMOVE("audiocpu")
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index c511ccd257b..4bbb0a6fb7d 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -381,75 +381,75 @@ static MACHINE_RESET( mlc )
static MACHINE_CONFIG_START( avengrgs, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */
- MDRV_CPU_PROGRAM_MAP(decomlc_map)
+ MCFG_CPU_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */
+ MCFG_CPU_PROGRAM_MAP(decomlc_map)
- MDRV_MACHINE_RESET(mlc)
- MDRV_EEPROM_93C46_ADD("eeprom") /* Actually 93c45 */
+ MCFG_MACHINE_RESET(mlc)
+ MCFG_EEPROM_93C46_ADD("eeprom") /* Actually 93c45 */
- MDRV_TIMER_ADD("int_timer", interrupt_gen)
+ MCFG_TIMER_ADD("int_timer", interrupt_gen)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(deco_mlc)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(deco_mlc)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(mlc)
- MDRV_VIDEO_UPDATE(mlc)
- MDRV_VIDEO_EOF(mlc)
+ MCFG_VIDEO_START(mlc)
+ MCFG_VIDEO_UPDATE(mlc)
+ MCFG_VIDEO_EOF(mlc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 42000000 / 3)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 42000000 / 3)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mlc, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
- MDRV_CPU_PROGRAM_MAP(decomlc_map)
+ MCFG_CPU_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
+ MCFG_CPU_PROGRAM_MAP(decomlc_map)
- MDRV_MACHINE_RESET(mlc)
- MDRV_EEPROM_93C46_ADD("eeprom") /* Actually 93c45 */
+ MCFG_MACHINE_RESET(mlc)
+ MCFG_EEPROM_93C46_ADD("eeprom") /* Actually 93c45 */
- MDRV_TIMER_ADD("int_timer", interrupt_gen)
+ MCFG_TIMER_ADD("int_timer", interrupt_gen)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(deco_mlc)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(deco_mlc)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(mlc)
- MDRV_VIDEO_UPDATE(mlc)
- MDRV_VIDEO_EOF(mlc)
+ MCFG_VIDEO_START(mlc)
+ MCFG_VIDEO_UPDATE(mlc)
+ MCFG_VIDEO_EOF(mlc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 42000000 / 3)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 42000000 / 3)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mlc_6bpp, mlc )
- MDRV_GFXDECODE(6bpp)
+ MCFG_GFXDECODE(6bpp)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mlc_5bpp, mlc )
- MDRV_GFXDECODE(5bpp)
+ MCFG_GFXDECODE(5bpp)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index 74ce2d79240..d6a4ac9710f 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -629,248 +629,248 @@ static PALETTE_INIT( decocass )
static MACHINE_CONFIG_START( decocass, decocass_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, HCLK4)
- MDRV_CPU_PROGRAM_MAP(decocass_map)
+ MCFG_CPU_ADD("maincpu", M6502, HCLK4)
+ MCFG_CPU_PROGRAM_MAP(decocass_map)
- MDRV_CPU_ADD("audiocpu", M6502, HCLK1/3/2)
- MDRV_CPU_PROGRAM_MAP(decocass_sound_map)
- MDRV_TIMER_ADD_SCANLINE("audionmi", decocass_audio_nmi_gen, "screen", 0, 8)
+ MCFG_CPU_ADD("audiocpu", M6502, HCLK1/3/2)
+ MCFG_CPU_PROGRAM_MAP(decocass_sound_map)
+ MCFG_TIMER_ADD_SCANLINE("audionmi", decocass_audio_nmi_gen, "screen", 0, 8)
- MDRV_CPU_ADD("mcu", I8041, HCLK)
- MDRV_CPU_IO_MAP(decocass_mcu_portmap)
+ MCFG_CPU_ADD("mcu", I8041, HCLK)
+ MCFG_CPU_IO_MAP(decocass_mcu_portmap)
- MDRV_QUANTUM_TIME(HZ(4200)) /* interleave CPUs */
+ MCFG_QUANTUM_TIME(HZ(4200)) /* interleave CPUs */
- MDRV_MACHINE_START(decocass)
- MDRV_MACHINE_RESET(decocass)
+ MCFG_MACHINE_START(decocass)
+ MCFG_MACHINE_RESET(decocass)
- MDRV_DECOCASS_TAPE_ADD("cassette")
+ MCFG_DECOCASS_TAPE_ADD("cassette")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(HCLK, 384, 8, 248, 272, 8, 248)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(HCLK, 384, 8, 248, 272, 8, 248)
- MDRV_GFXDECODE(decocass)
- MDRV_PALETTE_LENGTH(32+2*8+2*4)
+ MCFG_GFXDECODE(decocass)
+ MCFG_PALETTE_LENGTH(32+2*8+2*4)
- MDRV_PALETTE_INIT(decocass)
- MDRV_VIDEO_START(decocass)
- MDRV_VIDEO_UPDATE(decocass)
+ MCFG_PALETTE_INIT(decocass)
+ MCFG_VIDEO_START(decocass)
+ MCFG_VIDEO_UPDATE(decocass)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, HCLK2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay1", AY8910, HCLK2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ay2", AY8910, HCLK2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay2", AY8910, HCLK2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ctsttape, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(ctsttape)
+ MCFG_MACHINE_RESET(ctsttape)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( chwy, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(chwy)
+ MCFG_MACHINE_RESET(chwy)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( clocknch, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(clocknch)
+ MCFG_MACHINE_RESET(clocknch)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ctisland, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(ctisland)
+ MCFG_MACHINE_RESET(ctisland)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( csuperas, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(csuperas)
+ MCFG_MACHINE_RESET(csuperas)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( castfant, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(castfant)
+ MCFG_MACHINE_RESET(castfant)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cluckypo, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cluckypo)
+ MCFG_MACHINE_RESET(cluckypo)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cterrani, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cterrani)
+ MCFG_MACHINE_RESET(cterrani)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cexplore, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cexplore)
+ MCFG_MACHINE_RESET(cexplore)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cprogolf, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cprogolf)
+ MCFG_MACHINE_RESET(cprogolf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cmissnx, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cmissnx)
+ MCFG_MACHINE_RESET(cmissnx)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cdiscon1, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cdiscon1)
+ MCFG_MACHINE_RESET(cdiscon1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cptennis, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cptennis)
+ MCFG_MACHINE_RESET(cptennis)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ctornado, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(ctornado)
+ MCFG_MACHINE_RESET(ctornado)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cbnj, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cbnj)
+ MCFG_MACHINE_RESET(cbnj)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cburnrub, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cburnrub)
+ MCFG_MACHINE_RESET(cburnrub)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cbtime, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cbtime)
+ MCFG_MACHINE_RESET(cbtime)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cgraplop, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cgraplop)
+ MCFG_MACHINE_RESET(cgraplop)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cgraplop2, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cgraplop2)
+ MCFG_MACHINE_RESET(cgraplop2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( clapapa, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(clapapa)
+ MCFG_MACHINE_RESET(clapapa)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cfghtice, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cfghtice)
+ MCFG_MACHINE_RESET(cfghtice)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cprobowl, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cprobowl)
+ MCFG_MACHINE_RESET(cprobowl)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cnightst, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cnightst)
+ MCFG_MACHINE_RESET(cnightst)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cprosocc, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cprosocc)
+ MCFG_MACHINE_RESET(cprosocc)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cppicf, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cppicf)
+ MCFG_MACHINE_RESET(cppicf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cbdash, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cbdash)
+ MCFG_MACHINE_RESET(cbdash)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cscrtry, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cscrtry)
+ MCFG_MACHINE_RESET(cscrtry)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cflyball, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(cflyball)
+ MCFG_MACHINE_RESET(cflyball)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( czeroize, decocass )
/* basic machine hardware */
- MDRV_MACHINE_RESET(czeroize)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(1*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_MACHINE_RESET(czeroize)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 32*8-1, 1*8, 31*8-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index 35b5cbe2a2c..b18de1d2a5b 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -270,77 +270,77 @@ static MACHINE_RESET( deniam )
static MACHINE_CONFIG_START( deniam16b, deniam_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */
- MDRV_CPU_PROGRAM_MAP(deniam16b_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_assert)
+ MCFG_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */
+ MCFG_CPU_PROGRAM_MAP(deniam16b_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_assert)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_25MHz/4) /* 6.25Mhz verified */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_25MHz/4) /* 6.25Mhz verified */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_MACHINE_START(deniam)
- MDRV_MACHINE_RESET(deniam)
+ MCFG_MACHINE_START(deniam)
+ MCFG_MACHINE_RESET(deniam)
/* 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(24*8, 64*8-1, 0*8, 28*8-1) // looks better but doesn't match hardware
- MDRV_SCREEN_VISIBLE_AREA(24*8-4, 64*8-5, 0*8, 28*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(512, 256)
+ //MCFG_SCREEN_VISIBLE_AREA(24*8, 64*8-1, 0*8, 28*8-1) // looks better but doesn't match hardware
+ MCFG_SCREEN_VISIBLE_AREA(24*8-4, 64*8-5, 0*8, 28*8-1)
- MDRV_GFXDECODE(deniam)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(deniam)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(deniam)
- MDRV_VIDEO_UPDATE(deniam)
+ MCFG_VIDEO_START(deniam)
+ MCFG_VIDEO_UPDATE(deniam)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( deniam16c, deniam_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */
- MDRV_CPU_PROGRAM_MAP(deniam16c_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_assert)
+ MCFG_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */
+ MCFG_CPU_PROGRAM_MAP(deniam16c_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_assert)
- MDRV_MACHINE_START(deniam)
- MDRV_MACHINE_RESET(deniam)
+ MCFG_MACHINE_START(deniam)
+ MCFG_MACHINE_RESET(deniam)
/* 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(24*8, 64*8-1, 0*8, 28*8-1) // looks better but doesn't match hardware
- MDRV_SCREEN_VISIBLE_AREA(24*8-4, 64*8-5, 0*8, 28*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(512, 256)
+ //MCFG_SCREEN_VISIBLE_AREA(24*8, 64*8-1, 0*8, 28*8-1) // looks better but doesn't match hardware
+ MCFG_SCREEN_VISIBLE_AREA(24*8-4, 64*8-5, 0*8, 28*8-1)
- MDRV_GFXDECODE(deniam)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(deniam)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(deniam)
- MDRV_VIDEO_UPDATE(deniam)
+ MCFG_VIDEO_START(deniam)
+ MCFG_VIDEO_UPDATE(deniam)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c
index 7eb7e1d65ec..43d622fae27 100644
--- a/src/mame/drivers/deshoros.c
+++ b/src/mame/drivers/deshoros.c
@@ -157,26 +157,26 @@ static MACHINE_RESET( deshoros )
static MACHINE_CONFIG_START( deshoros, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M6809,2000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen",deshoros_irq)
+ MCFG_CPU_ADD("maincpu",M6809,2000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen",deshoros_irq)
- MDRV_MACHINE_RESET(deshoros)
+ MCFG_MACHINE_RESET(deshoros)
/* 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(48*8, 16*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 16*8-1)
- MDRV_PALETTE_LENGTH(16)
+ 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(48*8, 16*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 16*8-1)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(deshoros)
- MDRV_VIDEO_UPDATE(deshoros)
+ MCFG_VIDEO_START(deshoros)
+ MCFG_VIDEO_UPDATE(deshoros)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 8c6e2609b87..8b03f88dd7d 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -449,24 +449,24 @@ static MACHINE_START( destroyr )
static MACHINE_CONFIG_START( destroyr, destroyr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16)
- MDRV_CPU_PROGRAM_MAP(destroyr_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert, 4)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16)
+ MCFG_CPU_PROGRAM_MAP(destroyr_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_assert, 4)
- MDRV_MACHINE_START(destroyr)
- MDRV_MACHINE_RESET(destroyr)
+ MCFG_MACHINE_START(destroyr)
+ MCFG_MACHINE_RESET(destroyr)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
-
- MDRV_GFXDECODE(destroyr)
- MDRV_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(destroyr)
- MDRV_VIDEO_UPDATE(destroyr)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+
+ MCFG_GFXDECODE(destroyr)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(destroyr)
+ MCFG_VIDEO_UPDATE(destroyr)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 197658e1d23..6d63bfa2435 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -304,31 +304,31 @@ static MACHINE_RESET( dgpix )
static MACHINE_CONFIG_START( dgpix, driver_device )
- MDRV_CPU_ADD("maincpu", E132XT, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(cpu_map)
- MDRV_CPU_IO_MAP(io_map)
+ MCFG_CPU_ADD("maincpu", E132XT, 20000000*4) /* 4x internal multiplier */
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_IO_MAP(io_map)
/*
unknown 16bit sound cpu, embedded inside the KS0164 sound chip
running at 16.9MHz
*/
- MDRV_MACHINE_RESET(dgpix)
- MDRV_NVRAM_HANDLER(flashroms)
+ MCFG_MACHINE_RESET(dgpix)
+ MCFG_NVRAM_HANDLER(flashroms)
/* 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, 319, 0, 239)
-
- MDRV_PALETTE_INIT(BBBBB_GGGGG_RRRRR)
- MDRV_PALETTE_LENGTH(32768)
-
- MDRV_VIDEO_START(dgpix)
- MDRV_VIDEO_UPDATE(dgpix)
+ 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, 319, 0, 239)
+
+ MCFG_PALETTE_INIT(BBBBB_GGGGG_RRRRR)
+ MCFG_PALETTE_LENGTH(32768)
+
+ MCFG_VIDEO_START(dgpix)
+ MCFG_VIDEO_UPDATE(dgpix)
/* sound hardware */
// KS0164 sound chip
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 215eeb02b31..6f16e98d494 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -202,39 +202,39 @@ static MACHINE_START( dietgo )
static MACHINE_CONFIG_START( dietgo, dietgo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(dietgo_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */
+ MCFG_CPU_PROGRAM_MAP(dietgo_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, XTAL_32_22MHz/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(dietgo)
+ MCFG_MACHINE_START(dietgo)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_PALETTE_LENGTH(1024)
- MDRV_GFXDECODE(dietgo)
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(dietgo)
- MDRV_VIDEO_UPDATE(dietgo)
+ MCFG_VIDEO_UPDATE(dietgo)
- MDRV_DECO16IC_ADD("deco_custom", dietgo_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", dietgo_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_32_22MHz/9) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_32_22MHz/9) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
/* Diet Go Go */
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 977f1c8813b..006c222cdb5 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -465,44 +465,44 @@ static MACHINE_RESET( discoboy )
static MACHINE_CONFIG_START( discoboy, discoboy_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(discoboy_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
+ MCFG_CPU_PROGRAM_MAP(discoboy_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,10000000/2) /* 5 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
-// MDRV_CPU_IO_MAP(sound_io_map)
-// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,32)
+ MCFG_CPU_ADD("audiocpu", Z80,10000000/2) /* 5 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+// MCFG_CPU_IO_MAP(sound_io_map)
+// MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,32)
- MDRV_MACHINE_START( discoboy )
- MDRV_MACHINE_RESET( discoboy )
+ MCFG_MACHINE_START( discoboy )
+ MCFG_MACHINE_RESET( discoboy )
/* video hardware */
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(8*8, 512-1-8*8, 0+8, 256-1-8)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 512-1-8*8, 0+8, 256-1-8)
- MDRV_GFXDECODE(discoboy)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(discoboy)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(discoboy)
- MDRV_VIDEO_UPDATE(discoboy)
+ MCFG_VIDEO_START(discoboy)
+ MCFG_VIDEO_UPDATE(discoboy)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 2500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 2500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("msm", MSM5205, 384000) // ???? unknown
- MDRV_SOUND_CONFIG(discoboy_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000) // ???? unknown
+ MCFG_SOUND_CONFIG(discoboy_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 97f499bad62..273a8686744 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -251,33 +251,33 @@ static MACHINE_START( diverboy )
static MACHINE_CONFIG_START( diverboy, diverboy_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* guess */
- MDRV_CPU_PROGRAM_MAP(diverboy_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* guess */
+ MCFG_CPU_PROGRAM_MAP(diverboy_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(snd_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(snd_map)
- MDRV_MACHINE_START(diverboy)
+ MCFG_MACHINE_START(diverboy)
- MDRV_GFXDECODE(diverboy)
+ MCFG_GFXDECODE(diverboy)
- 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, 40*8+1, 2*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+4, 40*8+1, 2*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(diverboy)
- MDRV_VIDEO_UPDATE(diverboy)
+ MCFG_VIDEO_START(diverboy)
+ MCFG_VIDEO_UPDATE(diverboy)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1320000, 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/drivers/djboy.c b/src/mame/drivers/djboy.c
index 72e61c2fc29..2a6d1b85d13 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -585,55 +585,55 @@ static MACHINE_RESET( djboy )
static MACHINE_CONFIG_START( djboy, djboy_state )
- MDRV_CPU_ADD("maincpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(cpu0_am)
- MDRV_CPU_IO_MAP(cpu0_port_am)
- MDRV_TIMER_ADD_SCANLINE("scantimer", djboy_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(cpu0_am)
+ MCFG_CPU_IO_MAP(cpu0_port_am)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", djboy_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("cpu1", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(cpu1_am)
- MDRV_CPU_IO_MAP(cpu1_port_am)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("cpu1", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(cpu1_am)
+ MCFG_CPU_IO_MAP(cpu1_port_am)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("cpu2", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(cpu2_am)
- MDRV_CPU_IO_MAP(cpu2_port_am)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("cpu2", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(cpu2_am)
+ MCFG_CPU_IO_MAP(cpu2_port_am)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("beast", I80C51, 6000000)
- MDRV_CPU_IO_MAP(djboy_mcu_io_map)
+ MCFG_CPU_ADD("beast", I80C51, 6000000)
+ MCFG_CPU_IO_MAP(djboy_mcu_io_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(djboy)
- MDRV_MACHINE_RESET(djboy)
+ MCFG_MACHINE_START(djboy)
+ MCFG_MACHINE_RESET(djboy)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.5)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.5)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_GFXDECODE(djboy)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(djboy)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_KANEKO_PANDORA_ADD("pandora", djboy_pandora_config)
+ MCFG_KANEKO_PANDORA_ADD("pandora", djboy_pandora_config)
- MDRV_VIDEO_START(djboy)
- MDRV_VIDEO_UPDATE(djboy)
- MDRV_VIDEO_EOF(djboy)
+ MCFG_VIDEO_START(djboy)
+ MCFG_VIDEO_UPDATE(djboy)
+ MCFG_VIDEO_EOF(djboy)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki1", 12000000 / 8, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki1", 12000000 / 8, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki2", 12000000 / 8, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki2", 12000000 / 8, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index d1f3801c8b1..6f7e1eb8c11 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -1482,44 +1482,44 @@ static MACHINE_CONFIG_START( djmain, driver_device )
/* basic machine hardware */
// popn3 works 9.6 MHz or slower in some songs */
- //MDRV_CPU_ADD("maincpu", M68EC020, 18432000/2) /* 9.216 MHz!? */
- MDRV_CPU_ADD("maincpu", M68EC020, 32000000/4) /* 8.000 MHz!? */
- MDRV_CPU_PROGRAM_MAP(memory_map)
- MDRV_CPU_VBLANK_INT("screen", vb_interrupt)
+ //MCFG_CPU_ADD("maincpu", M68EC020, 18432000/2) /* 9.216 MHz!? */
+ MCFG_CPU_ADD("maincpu", M68EC020, 32000000/4) /* 8.000 MHz!? */
+ MCFG_CPU_PROGRAM_MAP(memory_map)
+ MCFG_CPU_VBLANK_INT("screen", vb_interrupt)
- MDRV_MACHINE_START(djmain)
- MDRV_MACHINE_RESET(djmain)
+ MCFG_MACHINE_START(djmain)
+ MCFG_MACHINE_RESET(djmain)
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(12, 512-12-1, 0, 384-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(12, 512-12-1, 0, 384-1)
- MDRV_PALETTE_LENGTH(0x4440/4)
- MDRV_GFXDECODE(djmain)
- MDRV_VIDEO_START(djmain)
- MDRV_VIDEO_UPDATE(djmain)
+ MCFG_PALETTE_LENGTH(0x4440/4)
+ MCFG_GFXDECODE(djmain)
+ MCFG_VIDEO_START(djmain)
+ MCFG_VIDEO_UPDATE(djmain)
- MDRV_K056832_ADD("k056832", djmain_k056832_intf)
- MDRV_K055555_ADD("k055555")
+ MCFG_K056832_ADD("k056832", djmain_k056832_intf)
+ MCFG_K055555_ADD("k055555")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami1", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami1", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("konami2", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami2", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index e28d93496d3..2cefa363b18 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -1661,118 +1661,118 @@ static void braze_decrypt_rom(running_machine *machine, UINT8 *dest)
static MACHINE_CONFIG_START( dkong_base, dkong_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CLOCK_1H)
- MDRV_CPU_PROGRAM_MAP(dkong_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, CLOCK_1H)
+ MCFG_CPU_PROGRAM_MAP(dkong_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(dkong2b)
- MDRV_MACHINE_RESET(dkong)
+ MCFG_MACHINE_START(dkong2b)
+ MCFG_MACHINE_RESET(dkong)
- MDRV_I8257_ADD("dma8257", CLOCK_1H, dk_dma)
+ MCFG_I8257_ADD("dma8257", CLOCK_1H, dk_dma)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_GFXDECODE(dkong)
- MDRV_PALETTE_LENGTH(DK2B_PALETTE_LENGTH)
+ MCFG_GFXDECODE(dkong)
+ MCFG_PALETTE_LENGTH(DK2B_PALETTE_LENGTH)
- MDRV_PALETTE_INIT(dkong2b)
- MDRV_VIDEO_START(dkong)
- MDRV_VIDEO_UPDATE(dkong)
+ MCFG_PALETTE_INIT(dkong2b)
+ MCFG_VIDEO_START(dkong)
+ MCFG_VIDEO_UPDATE(dkong)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( radarscp, dkong_base )
- MDRV_MACHINE_START(radarscp)
- MDRV_PALETTE_LENGTH(RS_PALETTE_LENGTH)
- MDRV_PALETTE_INIT(radarscp)
+ MCFG_MACHINE_START(radarscp)
+ MCFG_PALETTE_LENGTH(RS_PALETTE_LENGTH)
+ MCFG_PALETTE_INIT(radarscp)
/* sound hardware */
- MDRV_FRAGMENT_ADD(radarscp_audio)
+ MCFG_FRAGMENT_ADD(radarscp_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( radarscp1, dkong_base )
- MDRV_MACHINE_START(radarscp1)
- MDRV_PALETTE_LENGTH(RS_PALETTE_LENGTH)
- MDRV_PALETTE_INIT(radarscp1)
+ MCFG_MACHINE_START(radarscp1)
+ MCFG_PALETTE_LENGTH(RS_PALETTE_LENGTH)
+ MCFG_PALETTE_INIT(radarscp1)
/* sound hardware */
- MDRV_FRAGMENT_ADD(radarscp1_audio)
+ MCFG_FRAGMENT_ADD(radarscp1_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dkong2b, dkong_base )
- MDRV_MACHINE_START(dkong2b)
- MDRV_PALETTE_LENGTH(DK2B_PALETTE_LENGTH)
+ MCFG_MACHINE_START(dkong2b)
+ MCFG_PALETTE_LENGTH(DK2B_PALETTE_LENGTH)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dkong2b_audio)
+ MCFG_FRAGMENT_ADD(dkong2b_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( braze, dkong2b )
- MDRV_EEPROM_ADD("eeprom", braze_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", braze_eeprom_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dkong3, dkong_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) /* verified in schematics */
- MDRV_CPU_PROGRAM_MAP(dkong3_map)
- MDRV_CPU_IO_MAP(dkong3_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) /* verified in schematics */
+ MCFG_CPU_PROGRAM_MAP(dkong3_map)
+ MCFG_CPU_IO_MAP(dkong3_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(dkong3)
+ MCFG_MACHINE_START(dkong3)
- MDRV_Z80DMA_ADD("z80dma", CLOCK_1H, dk3_dma)
+ MCFG_Z80DMA_ADD("z80dma", CLOCK_1H, dk3_dma)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_GFXDECODE(dkong)
- MDRV_PALETTE_LENGTH(DK3_PALETTE_LENGTH)
+ MCFG_GFXDECODE(dkong)
+ MCFG_PALETTE_LENGTH(DK3_PALETTE_LENGTH)
- MDRV_PALETTE_INIT(dkong3)
- MDRV_VIDEO_START(dkong)
- MDRV_VIDEO_UPDATE(dkong)
+ MCFG_PALETTE_INIT(dkong3)
+ MCFG_VIDEO_START(dkong)
+ MCFG_VIDEO_UPDATE(dkong)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dkong3_audio)
+ MCFG_FRAGMENT_ADD(dkong3_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dkongjr, dkong_base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dkongjr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dkongjr_map)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dkongjr_audio)
+ MCFG_FRAGMENT_ADD(dkongjr_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pestplce, dkongjr )
- MDRV_GFXDECODE(pestplce)
- MDRV_PALETTE_LENGTH(DK2B_PALETTE_LENGTH)
- MDRV_PALETTE_INIT(dkong2b) /* wrong! */
- MDRV_VIDEO_UPDATE(pestplce)
+ MCFG_GFXDECODE(pestplce)
+ MCFG_PALETTE_LENGTH(DK2B_PALETTE_LENGTH)
+ MCFG_PALETTE_INIT(dkong2b) /* wrong! */
+ MCFG_VIDEO_UPDATE(pestplce)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dkong3b, dkongjr )
/* basic machine hardware */
- MDRV_PALETTE_INIT(dkong3)
+ MCFG_PALETTE_INIT(dkong3)
MACHINE_CONFIG_END
/*************************************
@@ -1784,25 +1784,25 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( s2650, dkong2b )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", S2650, CLOCK_1H / 2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(s2650_map)
- MDRV_CPU_IO_MAP(s2650_io_map)
- MDRV_CPU_VBLANK_INT("screen", s2650_interrupt)
+ MCFG_CPU_REPLACE("maincpu", S2650, CLOCK_1H / 2) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(s2650_map)
+ MCFG_CPU_IO_MAP(s2650_io_map)
+ MCFG_CPU_VBLANK_INT("screen", s2650_interrupt)
- MDRV_DEVICE_MODIFY("dma8257")
- MDRV_DEVICE_CONFIG(hb_dma)
+ MCFG_DEVICE_MODIFY("dma8257")
+ MCFG_DEVICE_CONFIG(hb_dma)
- MDRV_MACHINE_START(s2650)
+ MCFG_MACHINE_START(s2650)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spclforc, s2650 )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("soundcpu")
+ MCFG_DEVICE_REMOVE("soundcpu")
/* video hardware */
- MDRV_VIDEO_UPDATE(spclforc)
+ MCFG_VIDEO_UPDATE(spclforc)
MACHINE_CONFIG_END
@@ -1816,30 +1816,30 @@ static MACHINE_CONFIG_DERIVED( strtheat, dkong2b )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(epos_readport)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(epos_readport)
- MDRV_MACHINE_RESET(strtheat)
+ MCFG_MACHINE_RESET(strtheat)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( drakton, dkong2b )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(epos_readport)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(epos_readport)
- MDRV_MACHINE_RESET(drakton)
+ MCFG_MACHINE_RESET(drakton)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( drktnjr, dkongjr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(epos_readport)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(epos_readport)
- MDRV_MACHINE_RESET(drakton)
+ MCFG_MACHINE_RESET(drakton)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index db314eba2dc..de6dddfbd08 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -685,78 +685,78 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( dlair_base, dlair_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK_US/4)
- MDRV_CPU_PROGRAM_MAP(dlus_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_callback)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)MASTER_CLOCK_US/8/16/16/16/16)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_US/4)
+ MCFG_CPU_PROGRAM_MAP(dlus_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_callback)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, (double)MASTER_CLOCK_US/8/16/16/16/16)
- MDRV_MACHINE_START(dlair)
- MDRV_MACHINE_RESET(dlair)
+ MCFG_MACHINE_START(dlair)
+ MCFG_MACHINE_RESET(dlair)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK_US/8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK_US/8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
- 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( dlair_pr7820, dlair_base )
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_PR7820, "screen", "ldsound")
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_PR7820, "screen", "ldsound")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dlair_ldv1000, dlair_base )
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dleuro, dlair_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK_EURO/4)
- MDRV_CPU_CONFIG(dleuro_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(dleuro_map)
- MDRV_CPU_IO_MAP(dleuro_io_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_callback)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_EURO/4)
+ MCFG_CPU_CONFIG(dleuro_daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(dleuro_map)
+ MCFG_CPU_IO_MAP(dleuro_io_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_callback)
- MDRV_Z80CTC_ADD("ctc", MASTER_CLOCK_EURO/4 /* same as "maincpu" */, ctc_intf)
- MDRV_Z80SIO_ADD("sio", MASTER_CLOCK_EURO/4 /* same as "maincpu" */, sio_intf)
+ MCFG_Z80CTC_ADD("ctc", MASTER_CLOCK_EURO/4 /* same as "maincpu" */, ctc_intf)
+ MCFG_Z80SIO_ADD("sio", MASTER_CLOCK_EURO/4 /* same as "maincpu" */, sio_intf)
- MDRV_WATCHDOG_TIME_INIT(HZ(MASTER_CLOCK_EURO/(16*16*16*16*16*8)))
+ MCFG_WATCHDOG_TIME_INIT(HZ(MASTER_CLOCK_EURO/(16*16*16*16*16*8)))
- MDRV_MACHINE_START(dlair)
- MDRV_MACHINE_RESET(dlair)
+ MCFG_MACHINE_START(dlair)
+ MCFG_MACHINE_RESET(dlair)
- MDRV_LASERDISC_ADD("laserdisc", PHILLIPS_22VP932, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(dleuro, 256, 256, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_ADD("laserdisc", PHILLIPS_22VP932, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(dleuro, 256, 256, BITMAP_FORMAT_INDEXED16)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_PAL("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_SCREEN_ADD_PAL("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(dlair)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(dlair)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(dleuro)
+ MCFG_PALETTE_INIT(dleuro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("beep", BEEP, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
+ MCFG_SOUND_ADD("beep", BEEP, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
- 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
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index ffe138310ed..86331a960dd 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -489,36 +489,36 @@ static INTERRUPT_GEN( dderby_timer_irq )
static MACHINE_CONFIG_START( dderby, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(memmap)
- MDRV_CPU_VBLANK_INT("screen", dderby_irq)
- MDRV_CPU_PERIODIC_INT(dderby_timer_irq, 244/2)
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(memmap)
+ MCFG_CPU_VBLANK_INT("screen", dderby_irq)
+ MCFG_CPU_PERIODIC_INT(dderby_timer_irq, 244/2)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
- MDRV_CPU_PROGRAM_MAP(dderby_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
+ MCFG_CPU_PROGRAM_MAP(dderby_sound_map)
- MDRV_QUANTUM_TIME(HZ(6000))
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_QUANTUM_TIME(HZ(6000))
+ 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_GFXDECODE(dmndrby)
- MDRV_PALETTE_LENGTH(0x300)
- MDRV_PALETTE_INIT(dmnderby)
+ MCFG_GFXDECODE(dmndrby)
+ MCFG_PALETTE_LENGTH(0x300)
+ MCFG_PALETTE_INIT(dmnderby)
- MDRV_VIDEO_START(dderby)
- MDRV_VIDEO_UPDATE(dderby)
+ MCFG_VIDEO_START(dderby)
+ MCFG_VIDEO_UPDATE(dderby)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1789750) // frequency guessed
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ay1", AY8910, 1789750) // frequency guessed
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index 496bdaff3e6..fc4a9eb5e7a 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -595,84 +595,84 @@ static MACHINE_START( docastle )
static MACHINE_CONFIG_START( docastle, docastle_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(docastle_map)
- MDRV_CPU_IO_MAP(docastle_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_PROGRAM_MAP(docastle_map)
+ MCFG_CPU_IO_MAP(docastle_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("slave", Z80, XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(docastle_map2)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 8)
+ MCFG_CPU_ADD("slave", Z80, XTAL_4MHz)
+ MCFG_CPU_PROGRAM_MAP(docastle_map2)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 8)
- MDRV_CPU_ADD("cpu3", Z80, XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(docastle_map3)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("cpu3", Z80, XTAL_4MHz)
+ MCFG_CPU_PROGRAM_MAP(docastle_map3)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.60) // measured on pcb, real refresh rate should be derived from XTAL_9_828MHz, how?
- 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(1*8, 31*8-1, 4*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.60) // measured on pcb, real refresh rate should be derived from XTAL_9_828MHz, how?
+ 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(1*8, 31*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(docastle)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(docastle)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(docastle)
- MDRV_VIDEO_START(docastle)
- MDRV_VIDEO_UPDATE(docastle)
+ MCFG_PALETTE_INIT(docastle)
+ MCFG_VIDEO_START(docastle)
+ MCFG_VIDEO_UPDATE(docastle)
- MDRV_MACHINE_RESET( docastle )
- MDRV_MACHINE_START( docastle )
+ MCFG_MACHINE_RESET( docastle )
+ MCFG_MACHINE_START( docastle )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489A, XTAL_4MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("sn1", SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("sn2", SN76489A, XTAL_4MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("sn2", SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("sn3", SN76489A, XTAL_4MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("sn3", SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("sn4", SN76489A, XTAL_4MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("sn4", SN76489A, XTAL_4MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dorunrun, docastle )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dorunrun_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dorunrun_map)
- MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(dorunrun_map2)
+ MCFG_CPU_MODIFY("slave")
+ MCFG_CPU_PROGRAM_MAP(dorunrun_map2)
/* video hardware */
- MDRV_VIDEO_START(dorunrun)
+ MCFG_VIDEO_START(dorunrun)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( idsoccer, docastle )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(idsoccer_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(idsoccer_map)
- MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(idsoccer_map2)
+ MCFG_CPU_MODIFY("slave")
+ MCFG_CPU_PROGRAM_MAP(idsoccer_map2)
/* video hardware */
- MDRV_VIDEO_START(dorunrun)
+ MCFG_VIDEO_START(dorunrun)
/* sound hardware */
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* Crystal verified on American Soccer board. */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* Crystal verified on American Soccer board. */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 7dca8f6f1a1..2e35ea092a4 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -249,41 +249,41 @@ static MACHINE_RESET( dogfgt )
static MACHINE_CONFIG_START( dogfgt, dogfgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* ? controls music tempo */
+ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* ? controls music tempo */
- MDRV_CPU_ADD("sub", M6502, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", M6502, 1500000) /* 1.5 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(dogfgt)
- MDRV_MACHINE_RESET(dogfgt)
+ MCFG_MACHINE_START(dogfgt)
+ MCFG_MACHINE_RESET(dogfgt)
/* 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(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(dogfgt)
- MDRV_PALETTE_LENGTH(16+64)
+ MCFG_GFXDECODE(dogfgt)
+ MCFG_PALETTE_LENGTH(16+64)
- MDRV_PALETTE_INIT(dogfgt)
- MDRV_VIDEO_START(dogfgt)
- MDRV_VIDEO_UPDATE(dogfgt)
+ MCFG_PALETTE_INIT(dogfgt)
+ MCFG_VIDEO_START(dogfgt)
+ MCFG_VIDEO_UPDATE(dogfgt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 1001b944480..e3643d90c46 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -291,30 +291,30 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( dominob, dominob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2)
- MDRV_CPU_PROGRAM_MAP(memmap)
- MDRV_CPU_IO_MAP(portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2)
+ MCFG_CPU_PROGRAM_MAP(memmap)
+ MCFG_CPU_IO_MAP(portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.1524)
- 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, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.1524)
+ 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, 32*8-1)
- MDRV_GFXDECODE(dominob)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(dominob)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(dominob)
- MDRV_VIDEO_UPDATE(dominob)
+ MCFG_VIDEO_START(dominob)
+ MCFG_VIDEO_UPDATE(dominob)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index a6f981b6bb4..42e3f9f3a63 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -778,235 +778,235 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_FRAGMENT( sound_2203 )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( sound_2151 )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( sound_2151_m68k )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( lastday, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(lastday_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(lastday_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(lastday_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(lastday_sound_map)
- MDRV_MACHINE_START(lastday)
+ MCFG_MACHINE_START(lastday)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(lastday)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(lastday)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(lastday)
- MDRV_VIDEO_EOF(dooyong)
- MDRV_VIDEO_UPDATE(lastday)
+ MCFG_VIDEO_START(lastday)
+ MCFG_VIDEO_EOF(dooyong)
+ MCFG_VIDEO_UPDATE(lastday)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2203 )
+ MCFG_FRAGMENT_ADD( sound_2203 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gulfstrm, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(gulfstrm_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(gulfstrm_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(lastday_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(lastday_sound_map)
- MDRV_MACHINE_START(lastday)
+ MCFG_MACHINE_START(lastday)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
+ 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(lastday)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(lastday)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(gulfstrm)
- MDRV_VIDEO_EOF(dooyong)
- MDRV_VIDEO_UPDATE(gulfstrm)
+ MCFG_VIDEO_START(gulfstrm)
+ MCFG_VIDEO_EOF(dooyong)
+ MCFG_VIDEO_UPDATE(gulfstrm)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2203 )
+ MCFG_FRAGMENT_ADD( sound_2203 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pollux, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(pollux_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(pollux_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(pollux_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(pollux_sound_map)
- MDRV_MACHINE_START(lastday)
+ MCFG_MACHINE_START(lastday)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(lastday)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(lastday)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(pollux)
- MDRV_VIDEO_EOF(dooyong)
- MDRV_VIDEO_UPDATE(pollux)
+ MCFG_VIDEO_START(pollux)
+ MCFG_VIDEO_EOF(dooyong)
+ MCFG_VIDEO_UPDATE(pollux)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2203 )
+ MCFG_FRAGMENT_ADD( sound_2203 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bluehawk, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(bluehawk_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(bluehawk_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
- MDRV_MACHINE_START(lastday)
+ MCFG_MACHINE_START(lastday)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(bluehawk)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(bluehawk)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(bluehawk)
- MDRV_VIDEO_EOF(dooyong)
- MDRV_VIDEO_UPDATE(bluehawk)
+ MCFG_VIDEO_START(bluehawk)
+ MCFG_VIDEO_EOF(dooyong)
+ MCFG_VIDEO_UPDATE(bluehawk)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2151 )
+ MCFG_FRAGMENT_ADD( sound_2151 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( flytiger, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(flytiger_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(flytiger_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
- MDRV_MACHINE_START(lastday)
+ MCFG_MACHINE_START(lastday)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(flytiger)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(flytiger)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(flytiger)
- MDRV_VIDEO_EOF(dooyong)
- MDRV_VIDEO_UPDATE(flytiger)
+ MCFG_VIDEO_START(flytiger)
+ MCFG_VIDEO_EOF(dooyong)
+ MCFG_VIDEO_UPDATE(flytiger)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2151 )
+ MCFG_FRAGMENT_ADD( sound_2151 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( primella, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(primella_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(primella_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
- MDRV_MACHINE_START(lastday)
+ MCFG_MACHINE_START(lastday)
/* 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(8*8, (64-8)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 0*8, 32*8-1 )
- MDRV_GFXDECODE(primella)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(primella)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(primella)
- MDRV_VIDEO_EOF(dooyong)
- MDRV_VIDEO_UPDATE(primella)
+ MCFG_VIDEO_START(primella)
+ MCFG_VIDEO_EOF(dooyong)
+ MCFG_VIDEO_UPDATE(primella)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2151 )
+ MCFG_FRAGMENT_ADD( sound_2151 )
MACHINE_CONFIG_END
static INTERRUPT_GEN( rshark_interrupt )
@@ -1020,94 +1020,94 @@ static INTERRUPT_GEN( rshark_interrupt )
static MACHINE_CONFIG_START( rshark, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(rshark_map)
- MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* measured on super-x */
+ MCFG_CPU_PROGRAM_MAP(rshark_map)
+ MCFG_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
+ MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(rshark)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(rshark)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(rshark)
- MDRV_VIDEO_EOF(rshark)
- MDRV_VIDEO_UPDATE(rshark)
+ MCFG_VIDEO_START(rshark)
+ MCFG_VIDEO_EOF(rshark)
+ MCFG_VIDEO_UPDATE(rshark)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2151_m68k )
+ MCFG_FRAGMENT_ADD( sound_2151_m68k )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( superx, driver_device ) // dif mem map
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(superx_map)
- MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* measured on super-x */
+ MCFG_CPU_PROGRAM_MAP(superx_map)
+ MCFG_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
+ MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(rshark)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(rshark)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(rshark)
- MDRV_VIDEO_EOF(rshark)
- MDRV_VIDEO_UPDATE(rshark)
+ MCFG_VIDEO_START(rshark)
+ MCFG_VIDEO_EOF(rshark)
+ MCFG_VIDEO_UPDATE(rshark)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2151_m68k )
+ MCFG_FRAGMENT_ADD( sound_2151_m68k )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( popbingo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(popbingo_map)
- MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(popbingo_map)
+ MCFG_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
- MDRV_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* measured on super-x */
+ MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(popbingo)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(popbingo)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(popbingo)
- MDRV_VIDEO_EOF(rshark)
- MDRV_VIDEO_UPDATE(popbingo)
+ MCFG_VIDEO_START(popbingo)
+ MCFG_VIDEO_EOF(rshark)
+ MCFG_VIDEO_UPDATE(popbingo)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sound_2151_m68k )
+ MCFG_FRAGMENT_ADD( sound_2151_m68k )
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c
index cbeecb7668b..f42aee948f2 100644
--- a/src/mame/drivers/dorachan.c
+++ b/src/mame/drivers/dorachan.c
@@ -241,22 +241,22 @@ static MACHINE_RESET( dorachan )
static MACHINE_CONFIG_START( dorachan, dorachan_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(dorachan_map)
- MDRV_CPU_IO_MAP(dorachan_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("maincpu", Z80, 2000000)
+ MCFG_CPU_PROGRAM_MAP(dorachan_map)
+ MCFG_CPU_IO_MAP(dorachan_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_MACHINE_START(dorachan)
- MDRV_MACHINE_RESET(dorachan)
+ MCFG_MACHINE_START(dorachan)
+ MCFG_MACHINE_RESET(dorachan)
/* video hardware */
- MDRV_VIDEO_UPDATE(dorachan)
+ MCFG_VIDEO_UPDATE(dorachan)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c
index 0b5767e80c7..c2d68c81b81 100644
--- a/src/mame/drivers/dotrikun.c
+++ b/src/mame/drivers/dotrikun.c
@@ -147,23 +147,23 @@ static MACHINE_RESET( dotrikun )
static MACHINE_CONFIG_START( dotrikun, dotrikun_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(dotrikun_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(dotrikun_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(dotrikun)
- MDRV_MACHINE_RESET(dotrikun)
+ MCFG_MACHINE_START(dotrikun)
+ MCFG_MACHINE_RESET(dotrikun)
/* video hardware */
- MDRV_VIDEO_UPDATE(dotrikun)
-
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1)
+ MCFG_VIDEO_UPDATE(dotrikun)
+
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index 0f42b5b9d5b..353c3b4180e 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -336,36 +336,36 @@ static MACHINE_RESET( dragrace )
static MACHINE_CONFIG_START( dragrace, dragrace_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, 12096000 / 12)
- MDRV_CPU_PROGRAM_MAP(dragrace_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_CPU_ADD("maincpu", M6800, 12096000 / 12)
+ MCFG_CPU_PROGRAM_MAP(dragrace_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
- MDRV_MACHINE_START(dragrace)
- MDRV_MACHINE_RESET(dragrace)
+ MCFG_MACHINE_START(dragrace)
+ MCFG_MACHINE_RESET(dragrace)
- MDRV_TIMER_ADD_PERIODIC("frame_timer", dragrace_frame_callback, HZ(60))
+ MCFG_TIMER_ADD_PERIODIC("frame_timer", dragrace_frame_callback, HZ(60))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
-
- MDRV_GFXDECODE(dragrace)
- MDRV_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(dragrace)
- MDRV_VIDEO_START(dragrace)
- MDRV_VIDEO_UPDATE(dragrace)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+
+ MCFG_GFXDECODE(dragrace)
+ MCFG_PALETTE_LENGTH(16)
+ MCFG_PALETTE_INIT(dragrace)
+ MCFG_VIDEO_START(dragrace)
+ MCFG_VIDEO_UPDATE(dragrace)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dragrace)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dragrace)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 6a567fd22e3..281f978c9a2 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -421,36 +421,36 @@ static MACHINE_RESET( dreamwld )
static MACHINE_CONFIG_START( dreamwld, dreamwld_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(dreamwld_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold) // 4, 5, or 6, all point to the same place
+ MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(dreamwld_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) // 4, 5, or 6, all point to the same place
- MDRV_MACHINE_START(dreamwld)
- MDRV_MACHINE_RESET(dreamwld)
+ MCFG_MACHINE_START(dreamwld)
+ MCFG_MACHINE_RESET(dreamwld)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512,256)
- MDRV_SCREEN_VISIBLE_AREA(0, 304-1, 0, 224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512,256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 224-1)
- MDRV_PALETTE_LENGTH(0x1000)
- MDRV_GFXDECODE(dreamwld)
+ MCFG_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(dreamwld)
- MDRV_VIDEO_START(dreamwld)
- MDRV_VIDEO_UPDATE(dreamwld)
+ MCFG_VIDEO_START(dreamwld)
+ MCFG_VIDEO_UPDATE(dreamwld)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", MASTER_CLOCK/32, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki1", MASTER_CLOCK/32, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_OKIM6295_ADD("oki2", MASTER_CLOCK/32, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki2", MASTER_CLOCK/32, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index ec3ca8be8b8..6d25ec76787 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -405,41 +405,41 @@ static MACHINE_RESET( drgnmst )
static MACHINE_CONFIG_START( drgnmst, drgnmst_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* Confirmed */
- MDRV_CPU_PROGRAM_MAP(drgnmst_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Confirmed */
+ MCFG_CPU_PROGRAM_MAP(drgnmst_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", PIC16C55, 32000000/8) /* Confirmed */
+ MCFG_CPU_ADD("audiocpu", PIC16C55, 32000000/8) /* Confirmed */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(drgnmst_sound_io_map)
+ MCFG_CPU_IO_MAP(drgnmst_sound_io_map)
- MDRV_MACHINE_START(drgnmst)
- MDRV_MACHINE_RESET(drgnmst)
+ MCFG_MACHINE_START(drgnmst)
+ MCFG_MACHINE_RESET(drgnmst)
- MDRV_GFXDECODE(drgnmst)
+ MCFG_GFXDECODE(drgnmst)
- 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(8*8, 56*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(drgnmst)
- MDRV_VIDEO_UPDATE(drgnmst)
+ MCFG_VIDEO_START(drgnmst)
+ MCFG_VIDEO_UPDATE(drgnmst)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", 32000000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki1", 32000000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_OKIM6295_ADD("oki2", 32000000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki2", 32000000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index 9a457c2848f..d7bcfa35716 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -315,31 +315,31 @@ static MACHINE_RESET( dribling )
static MACHINE_CONFIG_START( dribling, dribling_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(dribling_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", dribling_irq_gen)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(dribling_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", dribling_irq_gen)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- MDRV_MACHINE_START(dribling)
- MDRV_MACHINE_RESET(dribling)
+ MCFG_MACHINE_START(dribling)
+ MCFG_MACHINE_RESET(dribling)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 40, 255)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 40, 255)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(dribling)
- MDRV_VIDEO_UPDATE(dribling)
+ MCFG_PALETTE_INIT(dribling)
+ MCFG_VIDEO_UPDATE(dribling)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index a8d764efa09..d54b2562219 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -250,46 +250,46 @@ static MACHINE_RESET( drmicro )
static MACHINE_CONFIG_START( drmicro, drmicro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,MCLK/6) /* 3.072MHz? */
- MDRV_CPU_PROGRAM_MAP(drmicro_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", drmicro_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80,MCLK/6) /* 3.072MHz? */
+ MCFG_CPU_PROGRAM_MAP(drmicro_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", drmicro_interrupt)
- MDRV_QUANTUM_TIME(HZ(60))
+ MCFG_QUANTUM_TIME(HZ(60))
- MDRV_MACHINE_START(drmicro)
- MDRV_MACHINE_RESET(drmicro)
+ MCFG_MACHINE_START(drmicro)
+ MCFG_MACHINE_RESET(drmicro)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(drmicro)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(drmicro)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(drmicro)
- MDRV_VIDEO_START(drmicro)
- MDRV_VIDEO_UPDATE(drmicro)
+ MCFG_PALETTE_INIT(drmicro)
+ MCFG_VIDEO_START(drmicro)
+ MCFG_VIDEO_UPDATE(drmicro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, MCLK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76496, MCLK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76496, MCLK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76496, MCLK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn3", SN76496, MCLK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn3", SN76496, MCLK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index c458ba49654..947171bc217 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -293,32 +293,32 @@ static MACHINE_RESET( drtomy )
static MACHINE_CONFIG_START( drtomy, drtomy_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(drtomy_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(drtomy_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(drtomy)
- MDRV_MACHINE_RESET(drtomy)
+ MCFG_MACHINE_START(drtomy)
+ MCFG_MACHINE_RESET(drtomy)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(drtomy)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(drtomy)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(drtomy)
- MDRV_VIDEO_UPDATE(drtomy)
+ MCFG_VIDEO_START(drtomy)
+ MCFG_VIDEO_UPDATE(drtomy)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 26000000/16, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
+ MCFG_OKIM6295_ADD("oki", 26000000/16, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index 7efac393b44..5276c4c0a79 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -428,36 +428,36 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( drw80pkr, driver_device )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", I8039, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drw80pkr_map)
- MDRV_CPU_IO_MAP(drw80pkr_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", I8039, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(drw80pkr_map)
+ MCFG_CPU_IO_MAP(drw80pkr_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(drw80pkr)
+ MCFG_MACHINE_START(drw80pkr)
// 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((31+1)*8, (31+1)*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 24*8-1, 0*8, 27*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((31+1)*8, (31+1)*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 24*8-1, 0*8, 27*8-1)
- MDRV_GFXDECODE(drw80pkr)
- MDRV_PALETTE_LENGTH(16*16)
+ MCFG_GFXDECODE(drw80pkr)
+ MCFG_PALETTE_LENGTH(16*16)
- MDRV_PALETTE_INIT(drw80pkr)
- MDRV_VIDEO_START(drw80pkr)
- MDRV_VIDEO_UPDATE(drw80pkr)
+ MCFG_PALETTE_INIT(drw80pkr)
+ MCFG_VIDEO_START(drw80pkr)
+ MCFG_VIDEO_UPDATE(drw80pkr)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8912, 20000000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("aysnd", AY8912, 20000000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
/*************************
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 747da638a0e..3df83042dbd 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -815,42 +815,42 @@ static MACHINE_RESET( dunhuang )
static MACHINE_CONFIG_START( dunhuang, dunhuang_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2)
- MDRV_CPU_PROGRAM_MAP(dunhuang_map)
- MDRV_CPU_IO_MAP(dunhuang_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2)
+ MCFG_CPU_PROGRAM_MAP(dunhuang_map)
+ MCFG_CPU_IO_MAP(dunhuang_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(dunhuang)
- MDRV_MACHINE_RESET(dunhuang)
+ MCFG_MACHINE_START(dunhuang)
+ MCFG_MACHINE_RESET(dunhuang)
- MDRV_WATCHDOG_TIME_INIT(SEC(5))
+ MCFG_WATCHDOG_TIME_INIT(SEC(5))
/* 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+8, 512-8-1, 0+16, 256-16-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+8, 512-8-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(dunhuang)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(dunhuang)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(dunhuang)
- MDRV_VIDEO_UPDATE(dunhuang)
+ MCFG_VIDEO_START(dunhuang)
+ MCFG_VIDEO_UPDATE(dunhuang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("ay8910", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(dunhuang_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay8910", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(dunhuang_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_OKIM6295_ADD("oki", 12000000/8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 12000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 237a1407d9a..3d493605e86 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -961,42 +961,42 @@ static MACHINE_CONFIG_START( dwarfd, dwarfd_state )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
- MDRV_CPU_ADD("maincpu", I8085A, 10595000/3*2) /* ? MHz */
- MDRV_CPU_CONFIG(dwarfd_i8085_config)
- MDRV_CPU_PROGRAM_MAP(mem_map)
- MDRV_CPU_IO_MAP(io_map)
+ MCFG_CPU_ADD("maincpu", I8085A, 10595000/3*2) /* ? MHz */
+ MCFG_CPU_CONFIG(dwarfd_i8085_config)
+ MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT_HACK(dwarfd_interrupt,NUM_LINES+4) //16 +vblank + 1 unused
+ MCFG_CPU_VBLANK_INT_HACK(dwarfd_interrupt,NUM_LINES+4) //16 +vblank + 1 unused
- MDRV_MACHINE_START(dwarfd)
- MDRV_MACHINE_RESET(dwarfd)
+ MCFG_MACHINE_START(dwarfd)
+ MCFG_MACHINE_RESET(dwarfd)
/* 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(272*2, 200)
- MDRV_SCREEN_VISIBLE_AREA(0, 272*2-1, 0, 200-1)
-
- MDRV_GFXDECODE(dwarfd)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(dwarfd)
-
- MDRV_VIDEO_START(dwarfd)
- MDRV_VIDEO_UPDATE(dwarfd)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ 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(272*2, 200)
+ MCFG_SCREEN_VISIBLE_AREA(0, 272*2-1, 0, 200-1)
+
+ MCFG_GFXDECODE(dwarfd)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(dwarfd)
+
+ MCFG_VIDEO_START(dwarfd)
+ MCFG_VIDEO_UPDATE(dwarfd)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qc, dwarfd )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qc_map)
- MDRV_CPU_IO_MAP(qc_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(qc_map)
+ MCFG_CPU_IO_MAP(qc_io_map)
MACHINE_CONFIG_END
ROM_START( dwarfd )
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index 10c27df4853..9c2c231b6a8 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -237,38 +237,38 @@ static MACHINE_RESET( dynadice )
static MACHINE_CONFIG_START( dynadice, dynadice_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080,18432000/8)
- MDRV_CPU_PROGRAM_MAP(dynadice_map)
- MDRV_CPU_IO_MAP(dynadice_io_map)
+ MCFG_CPU_ADD("maincpu", I8080,18432000/8)
+ MCFG_CPU_PROGRAM_MAP(dynadice_map)
+ MCFG_CPU_IO_MAP(dynadice_io_map)
- MDRV_CPU_ADD("audiocpu", Z80,18432000/6)
- MDRV_CPU_PROGRAM_MAP(dynadice_sound_map)
- MDRV_CPU_IO_MAP(dynadice_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,18432000/6)
+ MCFG_CPU_PROGRAM_MAP(dynadice_sound_map)
+ MCFG_CPU_IO_MAP(dynadice_sound_io_map)
- MDRV_MACHINE_START(dynadice)
- MDRV_MACHINE_RESET(dynadice)
+ MCFG_MACHINE_START(dynadice)
+ MCFG_MACHINE_RESET(dynadice)
- 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(256+16, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 34*8-1, 3*8, 28*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(256+16, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 34*8-1, 3*8, 28*8-1)
- MDRV_GFXDECODE(dynadice)
- MDRV_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(dynadice)
+ MCFG_GFXDECODE(dynadice)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(dynadice)
- MDRV_VIDEO_START(dynadice)
- MDRV_VIDEO_UPDATE(dynadice)
+ MCFG_VIDEO_START(dynadice)
+ MCFG_VIDEO_UPDATE(dynadice)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( dynadice )
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 2278301aa83..0a11c87738a 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -4336,46 +4336,46 @@ static const msm5205_interface hanamai_msm5205_interface =
static MACHINE_CONFIG_START( hanamai, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map)
- MDRV_CPU_IO_MAP(hanamai_io_map)
- MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
+ MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
+ MCFG_CPU_IO_MAP(hanamai_io_map)
+ MCFG_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
- MDRV_MACHINE_START(hanamai)
- MDRV_MACHINE_RESET(dynax)
+ MCFG_MACHINE_START(hanamai)
+ MCFG_MACHINE_RESET(dynax)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1-4, 16+8, 255-8)
+ 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-4, 16+8, 255-8)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(sprtmtch) // static palette
- MDRV_VIDEO_START(hanamai)
- MDRV_VIDEO_UPDATE(hanamai)
+ MCFG_PALETTE_INIT(sprtmtch) // static palette
+ MCFG_VIDEO_START(hanamai)
+ MCFG_VIDEO_UPDATE(hanamai)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 22000000 / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, 22000000 / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
- MDRV_SOUND_CONFIG(hanamai_ym2203_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
+ MCFG_SOUND_CONFIG(hanamai_ym2203_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(hanamai_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(hanamai_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4394,42 +4394,42 @@ static const ay8910_interface hnoridur_ay8910_interface =
static MACHINE_CONFIG_START( hnoridur, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(hnoridur_mem_map)
- MDRV_CPU_IO_MAP(hnoridur_io_map)
- MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
+ MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_CPU_PROGRAM_MAP(hnoridur_mem_map)
+ MCFG_CPU_IO_MAP(hnoridur_io_map)
+ MCFG_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
- MDRV_MACHINE_START(hnoridur)
- MDRV_MACHINE_RESET(dynax)
+ MCFG_MACHINE_START(hnoridur)
+ MCFG_MACHINE_RESET(dynax)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1-4, 16, 256-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-4, 16, 256-1)
- MDRV_PALETTE_LENGTH(16*256)
+ MCFG_PALETTE_LENGTH(16*256)
- MDRV_VIDEO_START(hnoridur)
- MDRV_VIDEO_UPDATE(hnoridur)
+ MCFG_VIDEO_START(hnoridur)
+ MCFG_VIDEO_UPDATE(hnoridur)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 22000000 / 16)
- MDRV_SOUND_CONFIG(hnoridur_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, 22000000 / 16)
+ MCFG_SOUND_CONFIG(hnoridur_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(hanamai_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(hanamai_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4440,42 +4440,42 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hjingi, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, XTAL_22MHz / 4)
- MDRV_CPU_PROGRAM_MAP(hjingi_mem_map)
- MDRV_CPU_IO_MAP(hjingi_io_map)
- MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
+ MCFG_CPU_ADD("maincpu",Z80, XTAL_22MHz / 4)
+ MCFG_CPU_PROGRAM_MAP(hjingi_mem_map)
+ MCFG_CPU_IO_MAP(hjingi_io_map)
+ MCFG_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
- MDRV_MACHINE_START(hnoridur)
- MDRV_MACHINE_RESET(dynax)
+ MCFG_MACHINE_START(hnoridur)
+ MCFG_MACHINE_RESET(dynax)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1-4, 16, 256-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-4, 16, 256-1)
- MDRV_PALETTE_LENGTH(16*256)
+ MCFG_PALETTE_LENGTH(16*256)
- MDRV_VIDEO_START(hnoridur)
- MDRV_VIDEO_UPDATE(hnoridur)
+ MCFG_VIDEO_START(hnoridur)
+ MCFG_VIDEO_UPDATE(hnoridur)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_22MHz / 16)
- MDRV_SOUND_CONFIG(hnoridur_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_22MHz / 16)
+ MCFG_SOUND_CONFIG(hnoridur_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz )
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz )
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz )
- MDRV_SOUND_CONFIG(hanamai_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz )
+ MCFG_SOUND_CONFIG(hanamai_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4499,39 +4499,39 @@ static const ym2203_interface sprtmtch_ym2203_interface =
static MACHINE_CONFIG_START( sprtmtch, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map)
- MDRV_CPU_IO_MAP(sprtmtch_io_map)
- MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
+ MCFG_CPU_ADD("maincpu", Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
+ MCFG_CPU_IO_MAP(sprtmtch_io_map)
+ MCFG_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
- MDRV_MACHINE_START(hanamai)
- MDRV_MACHINE_RESET(dynax)
+ MCFG_MACHINE_START(hanamai)
+ MCFG_MACHINE_RESET(dynax)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-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, 16, 256-1)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(sprtmtch) // static palette
- MDRV_VIDEO_START(sprtmtch)
- MDRV_VIDEO_UPDATE(sprtmtch)
+ MCFG_PALETTE_INIT(sprtmtch) // static palette
+ MCFG_VIDEO_START(sprtmtch)
+ MCFG_VIDEO_UPDATE(sprtmtch)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
- MDRV_SOUND_CONFIG(sprtmtch_ym2203_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
+ MCFG_SOUND_CONFIG(sprtmtch_ym2203_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4542,35 +4542,35 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mjfriday, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,24000000/4) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map)
- MDRV_CPU_IO_MAP(mjfriday_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,24000000/4) /* 6 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
+ MCFG_CPU_IO_MAP(mjfriday_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(hanamai)
- MDRV_MACHINE_RESET(dynax)
+ MCFG_MACHINE_START(hanamai)
+ MCFG_MACHINE_RESET(dynax)
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(sprtmtch) // static palette
- MDRV_VIDEO_START(mjdialq2)
- MDRV_VIDEO_UPDATE(mjdialq2)
+ MCFG_PALETTE_INIT(sprtmtch) // static palette
+ MCFG_VIDEO_START(mjdialq2)
+ MCFG_VIDEO_UPDATE(mjdialq2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 24000000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 24000000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4581,8 +4581,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjdialq2, mjfriday )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjdialq2_mem_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjdialq2_mem_map)
MACHINE_CONFIG_END
@@ -4610,19 +4610,19 @@ static INTERRUPT_GEN( yarunara_clock_interrupt )
static MACHINE_CONFIG_DERIVED( yarunara, hnoridur )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yarunara_mem_map)
- MDRV_CPU_IO_MAP(yarunara_io_map)
- MDRV_CPU_PERIODIC_INT(yarunara_clock_interrupt, 60) // RTC
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(yarunara_mem_map)
+ MCFG_CPU_IO_MAP(yarunara_io_map)
+ MCFG_CPU_PERIODIC_INT(yarunara_clock_interrupt, 60) // RTC
- MDRV_NVRAM_REPLACE_0FILL("nvram")
+ MCFG_NVRAM_REPLACE_0FILL("nvram")
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 8, 256-1-8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 8, 256-1-8-1)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
@@ -4631,11 +4631,11 @@ MACHINE_CONFIG_END
***************************************************************************/
static MACHINE_CONFIG_DERIVED( mcnpshnt, hnoridur )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mcnpshnt_mem_map)
- MDRV_CPU_IO_MAP(mcnpshnt_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mcnpshnt_mem_map)
+ MCFG_CPU_IO_MAP(mcnpshnt_io_map)
- MDRV_VIDEO_START(mcnpshnt) // different priorities
+ MCFG_VIDEO_START(mcnpshnt) // different priorities
MACHINE_CONFIG_END
@@ -4644,9 +4644,9 @@ MACHINE_CONFIG_END
***************************************************************************/
static MACHINE_CONFIG_DERIVED( nanajign, hnoridur )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nanajign_mem_map)
- MDRV_CPU_IO_MAP(nanajign_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(nanajign_mem_map)
+ MCFG_CPU_IO_MAP(nanajign_io_map)
MACHINE_CONFIG_END
@@ -4690,62 +4690,62 @@ static MACHINE_START( jantouki )
static MACHINE_CONFIG_START( jantouki, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(jantouki_mem_map)
- MDRV_CPU_IO_MAP(jantouki_io_map)
- MDRV_CPU_VBLANK_INT("top", jantouki_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
+ MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_CPU_PROGRAM_MAP(jantouki_mem_map)
+ MCFG_CPU_IO_MAP(jantouki_io_map)
+ MCFG_CPU_VBLANK_INT("top", jantouki_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
- MDRV_CPU_ADD("soundcpu",Z80,22000000 / 4) /* 5.5MHz */
- MDRV_CPU_PROGRAM_MAP(jantouki_sound_mem_map)
- MDRV_CPU_IO_MAP(jantouki_sound_io_map)
- MDRV_CPU_VBLANK_INT("top", jantouki_sound_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
+ MCFG_CPU_ADD("soundcpu",Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_CPU_PROGRAM_MAP(jantouki_sound_mem_map)
+ MCFG_CPU_IO_MAP(jantouki_sound_io_map)
+ MCFG_CPU_VBLANK_INT("top", jantouki_sound_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
- MDRV_MACHINE_START(jantouki)
- MDRV_MACHINE_RESET(dynax)
+ MCFG_MACHINE_START(jantouki)
+ MCFG_MACHINE_RESET(dynax)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_PALETTE_LENGTH(512)
- MDRV_DEFAULT_LAYOUT(layout_dualhuov)
-
- MDRV_SCREEN_ADD("top", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1)
-
- MDRV_SCREEN_ADD("bottom", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1)
-
- MDRV_PALETTE_INIT(sprtmtch) // static palette
- MDRV_VIDEO_START(jantouki)
- MDRV_VIDEO_UPDATE(jantouki)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_DEFAULT_LAYOUT(layout_dualhuov)
+
+ MCFG_SCREEN_ADD("top", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1)
+
+ MCFG_SCREEN_ADD("bottom", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1)
+
+ MCFG_PALETTE_INIT(sprtmtch) // static palette
+ MCFG_VIDEO_START(jantouki)
+ MCFG_VIDEO_UPDATE(jantouki)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 22000000 / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, 22000000 / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
- MDRV_SOUND_CONFIG(jantouki_ym2203_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 22000000 / 8)
+ MCFG_SOUND_CONFIG(jantouki_ym2203_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(jantouki_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(jantouki_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
@@ -4774,12 +4774,12 @@ static INTERRUPT_GEN( mjelctrn_vblank_interrupt )
}
static MACHINE_CONFIG_DERIVED( mjelctrn, hnoridur )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nanajign_mem_map)
- MDRV_CPU_IO_MAP(mjelctrn_io_map)
- MDRV_CPU_VBLANK_INT("screen", mjelctrn_vblank_interrupt) /* IM 2 needs a vector on the data bus */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(nanajign_mem_map)
+ MCFG_CPU_IO_MAP(mjelctrn_io_map)
+ MCFG_CPU_VBLANK_INT("screen", mjelctrn_vblank_interrupt) /* IM 2 needs a vector on the data bus */
- MDRV_VIDEO_START(mjelctrn)
+ MCFG_VIDEO_START(mjelctrn)
MACHINE_CONFIG_END
@@ -4814,10 +4814,10 @@ static INTERRUPT_GEN( neruton_vblank_interrupt )
}
static MACHINE_CONFIG_DERIVED( neruton, mjelctrn )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT_HACK(neruton_vblank_interrupt,1+10) /* IM 2 needs a vector on the data bus */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT_HACK(neruton_vblank_interrupt,1+10) /* IM 2 needs a vector on the data bus */
- MDRV_VIDEO_START(neruton)
+ MCFG_VIDEO_START(neruton)
MACHINE_CONFIG_END
/***************************************************************************
@@ -4839,8 +4839,8 @@ static INTERRUPT_GEN( majxtal7_vblank_interrupt )
}
static MACHINE_CONFIG_DERIVED( majxtal7, neruton )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", majxtal7_vblank_interrupt) /* IM 2 needs a vector on the data bus */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", majxtal7_vblank_interrupt) /* IM 2 needs a vector on the data bus */
MACHINE_CONFIG_END
@@ -4861,43 +4861,43 @@ static const ay8910_interface htengoku_ay8910_interface =
static MACHINE_CONFIG_START( htengoku, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,20000000 / 4)
- MDRV_CPU_PROGRAM_MAP(yarunara_mem_map)
- MDRV_CPU_IO_MAP(htengoku_io_map)
- MDRV_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
- MDRV_CPU_PERIODIC_INT(yarunara_clock_interrupt, 60) // RTC
+ MCFG_CPU_ADD("maincpu",Z80,20000000 / 4)
+ MCFG_CPU_PROGRAM_MAP(yarunara_mem_map)
+ MCFG_CPU_IO_MAP(htengoku_io_map)
+ MCFG_CPU_VBLANK_INT("screen", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
+ MCFG_CPU_PERIODIC_INT(yarunara_clock_interrupt, 60) // RTC
- MDRV_MACHINE_START(htengoku)
- MDRV_MACHINE_RESET(dynax)
+ MCFG_MACHINE_START(htengoku)
+ MCFG_MACHINE_RESET(dynax)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 336-1, 0+8, 256-1-8)
+ 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, 336-1, 0+8, 256-1-8)
- MDRV_PALETTE_LENGTH(16*256)
+ MCFG_PALETTE_LENGTH(16*256)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(htengoku)
- MDRV_VIDEO_UPDATE(htengoku)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(htengoku)
+ MCFG_VIDEO_UPDATE(htengoku)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 20000000 / 16)
- MDRV_SOUND_CONFIG(htengoku_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, 20000000 / 16)
+ MCFG_SOUND_CONFIG(htengoku_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
@@ -4939,46 +4939,46 @@ static MACHINE_START( tenkai )
static MACHINE_CONFIG_START( tenkai, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",TMP91640, 21472700 / 2)
- MDRV_CPU_PROGRAM_MAP(tenkai_map)
- MDRV_CPU_IO_MAP(tenkai_io_map)
- MDRV_CPU_VBLANK_INT_HACK(tenkai_interrupt,3)
+ MCFG_CPU_ADD("maincpu",TMP91640, 21472700 / 2)
+ MCFG_CPU_PROGRAM_MAP(tenkai_map)
+ MCFG_CPU_IO_MAP(tenkai_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(tenkai_interrupt,3)
- MDRV_MACHINE_START(tenkai)
- MDRV_MACHINE_RESET(dynax)
+ MCFG_MACHINE_START(tenkai)
+ MCFG_MACHINE_RESET(dynax)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(4, 512-1, 4, 255-8-4) // hide first 4 horizontal pixels (see scroll of gal 4 in test mode)
+ 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(4, 512-1, 4, 255-8-4) // hide first 4 horizontal pixels (see scroll of gal 4 in test mode)
- MDRV_PALETTE_LENGTH(16*256)
+ MCFG_PALETTE_LENGTH(16*256)
- MDRV_VIDEO_START(mjelctrn)
- MDRV_VIDEO_UPDATE(hnoridur)
+ MCFG_VIDEO_START(mjelctrn)
+ MCFG_VIDEO_UPDATE(hnoridur)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 22000000 / 16)
- MDRV_SOUND_CONFIG(tenkai_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, 22000000 / 16)
+ MCFG_SOUND_CONFIG(tenkai_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( majrjhdx, tenkai )
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(sprtmtch) // static palette
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(sprtmtch) // static palette
MACHINE_CONFIG_END
/***************************************************************************
@@ -5009,38 +5009,38 @@ static MACHINE_RESET( gekisha )
static MACHINE_CONFIG_START( gekisha, dynax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",TMP90841, XTAL_10MHz ) // ?
- MDRV_CPU_PROGRAM_MAP(gekisha_map)
- MDRV_CPU_IO_MAP(gekisha_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",TMP90841, XTAL_10MHz ) // ?
+ MCFG_CPU_PROGRAM_MAP(gekisha_map)
+ MCFG_CPU_IO_MAP(gekisha_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(gekisha)
- MDRV_MACHINE_RESET(gekisha)
+ MCFG_MACHINE_START(gekisha)
+ MCFG_MACHINE_RESET(gekisha)
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(2, 256-1, 16, 256-1)
-
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(sprtmtch) // static palette
- MDRV_VIDEO_START(mjdialq2)
- MDRV_VIDEO_UPDATE(mjdialq2)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(2, 256-1, 16, 256-1)
+
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(sprtmtch) // static palette
+ MCFG_VIDEO_START(mjdialq2)
+ MCFG_VIDEO_UPDATE(mjdialq2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_24MHz / 16) // ?
- MDRV_SOUND_CONFIG(tenkai_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_24MHz / 16) // ?
+ MCFG_SOUND_CONFIG(tenkai_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_24MHz / 8) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_24MHz / 8) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index 73847cce20d..d7a45864c96 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -272,36 +272,36 @@ static INTERRUPT_GEN( dynduke_interrupt )
static MACHINE_CONFIG_START( dynduke, dynduke_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", V30, 16000000/2) // NEC V30-8 CPU
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_VBLANK_INT("screen", dynduke_interrupt)
+ MCFG_CPU_ADD("maincpu", V30, 16000000/2) // NEC V30-8 CPU
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_VBLANK_INT("screen", dynduke_interrupt)
- MDRV_CPU_ADD("slave", V30, 16000000/2) // NEC V30-8 CPU
- MDRV_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_VBLANK_INT("screen", dynduke_interrupt)
+ MCFG_CPU_ADD("slave", V30, 16000000/2) // NEC V30-8 CPU
+ MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_VBLANK_INT("screen", dynduke_interrupt)
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_QUANTUM_TIME(HZ(3600))
+ MCFG_QUANTUM_TIME(HZ(3600))
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
// 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(2500) /* not accurate */)
- 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)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(dynduke)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(dynduke)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(dynduke)
- MDRV_VIDEO_UPDATE(dynduke)
- MDRV_VIDEO_EOF(dynduke)
+ MCFG_VIDEO_START(dynduke)
+ MCFG_VIDEO_UPDATE(dynduke)
+ MCFG_VIDEO_EOF(dynduke)
// sound hardware
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000)
@@ -309,8 +309,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dbldyn, dynduke )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(masterj_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(masterj_map)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index e14ad3638f6..5ad03aad6d0 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -411,36 +411,36 @@ static MACHINE_RESET( egghunt )
static MACHINE_CONFIG_START( egghunt, egghunt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz ?*/
- MDRV_CPU_PROGRAM_MAP(egghunt_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // or 2 like mitchell.c?
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz ?*/
+ MCFG_CPU_PROGRAM_MAP(egghunt_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) // or 2 like mitchell.c?
- MDRV_CPU_ADD("audiocpu", Z80,12000000/2) /* 6 MHz ?*/
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,12000000/2) /* 6 MHz ?*/
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(egghunt)
- MDRV_MACHINE_RESET(egghunt)
+ MCFG_MACHINE_START(egghunt)
+ MCFG_MACHINE_RESET(egghunt)
/* 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(8*8, 56*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(egghunt)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(egghunt)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(egghunt)
- MDRV_VIDEO_UPDATE(egghunt)
+ MCFG_VIDEO_START(egghunt)
+ MCFG_VIDEO_UPDATE(egghunt)
/* 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
ROM_START( egghunt )
diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c
index 25d1c54e4c0..4d35db7b938 100644
--- a/src/mame/drivers/embargo.c
+++ b/src/mame/drivers/embargo.c
@@ -255,21 +255,21 @@ static MACHINE_RESET( embargo )
static MACHINE_CONFIG_START( embargo, embargo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, 625000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_ADD("maincpu", S2650, 625000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
- MDRV_MACHINE_START(embargo)
- MDRV_MACHINE_RESET(embargo)
+ MCFG_MACHINE_START(embargo)
+ MCFG_MACHINE_RESET(embargo)
/* video hardware */
- MDRV_VIDEO_UPDATE(embargo)
+ MCFG_VIDEO_UPDATE(embargo)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_SCREEN_REFRESH_RATE(60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 71aac277b44..fb690b085e2 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -604,59 +604,59 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( enigma2, enigma2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(engima2_main_cpu_map)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(engima2_main_cpu_map)
- MDRV_CPU_ADD("audiocpu", Z80, 2500000)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
- MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 2500000)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
+ MCFG_CPU_PROGRAM_MAP(engima2_audio_cpu_map)
- MDRV_MACHINE_START(enigma2)
- MDRV_MACHINE_RESET(enigma2)
+ MCFG_MACHINE_START(enigma2)
+ MCFG_MACHINE_RESET(enigma2)
/* video hardware */
- MDRV_VIDEO_UPDATE(enigma2)
+ MCFG_VIDEO_UPDATE(enigma2)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY8910_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY8910_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( enigma2a, enigma2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(engima2a_main_cpu_map)
- MDRV_CPU_IO_MAP(engima2a_main_cpu_io_map)
+ MCFG_CPU_ADD("maincpu", I8080, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(engima2a_main_cpu_map)
+ MCFG_CPU_IO_MAP(engima2a_main_cpu_io_map)
- MDRV_CPU_ADD("audiocpu", Z80, 2500000)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
- MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 2500000)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
+ MCFG_CPU_PROGRAM_MAP(engima2_audio_cpu_map)
- MDRV_MACHINE_START(enigma2)
- MDRV_MACHINE_RESET(enigma2)
+ MCFG_MACHINE_START(enigma2)
+ MCFG_MACHINE_RESET(enigma2)
/* video hardware */
- MDRV_VIDEO_UPDATE(enigma2a)
+ MCFG_VIDEO_UPDATE(enigma2a)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY8910_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY8910_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index bc6a33686fa..2c79f15b441 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -332,39 +332,39 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( eolith45, driver_device )
- MDRV_CPU_ADD("maincpu", E132N, 45000000) /* 45 MHz */
- MDRV_CPU_PROGRAM_MAP(eolith_map)
- MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
+ MCFG_CPU_ADD("maincpu", E132N, 45000000) /* 45 MHz */
+ MCFG_CPU_PROGRAM_MAP(eolith_map)
+ MCFG_CPU_VBLANK_INT_HACK(eolith_speedup,262)
/* sound cpu */
- MDRV_EEPROM_ADD("eeprom", eeprom_interface_93C66)
+ MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C66)
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_VIDEO_START(eolith)
- MDRV_VIDEO_UPDATE(eolith)
+ MCFG_VIDEO_START(eolith)
+ MCFG_VIDEO_UPDATE(eolith)
/* sound hardware */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( eolith50, eolith45 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(50000000) /* 50 MHz */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(50000000) /* 50 MHz */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ironfort, eolith45 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(44900000) /* Normaly 45MHz??? but PCB actually had a 44.9MHz OSC, so it's value is used */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(44900000) /* Normaly 45MHz??? but PCB actually had a 44.9MHz OSC, so it's value is used */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index 922f5da0873..e3b4f0f3443 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -158,31 +158,31 @@ static PALETTE_INIT( eolith16 )
static MACHINE_CONFIG_START( eolith16, driver_device )
- MDRV_CPU_ADD("maincpu", E116T, 60000000) /* no internal multiplier */
- MDRV_CPU_PROGRAM_MAP(eolith16_map)
- MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
+ MCFG_CPU_ADD("maincpu", E116T, 60000000) /* no internal multiplier */
+ MCFG_CPU_PROGRAM_MAP(eolith16_map)
+ MCFG_CPU_VBLANK_INT_HACK(eolith_speedup,262)
- MDRV_EEPROM_ADD("eeprom", eeprom_interface_93C66)
+ MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C66)
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 199)
+ 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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 199)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(eolith16)
- MDRV_VIDEO_START(eolith16)
- MDRV_VIDEO_UPDATE(eolith16)
+ MCFG_PALETTE_INIT(eolith16)
+ MCFG_VIDEO_START(eolith16)
+ MCFG_VIDEO_UPDATE(eolith16)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ 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/epos.c b/src/mame/drivers/epos.c
index 21cec0862fc..2932059619c 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -395,58 +395,58 @@ static MACHINE_START( dealer )
static MACHINE_CONFIG_START( epos, epos_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 11000000/4) /* 2.75 MHz (see notes) */
- MDRV_CPU_PROGRAM_MAP(epos_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 11000000/4) /* 2.75 MHz (see notes) */
+ MCFG_CPU_PROGRAM_MAP(epos_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(epos)
- MDRV_MACHINE_RESET(epos)
+ MCFG_MACHINE_RESET(epos)
+ MCFG_MACHINE_RESET(epos)
/* video hardware */
- MDRV_VIDEO_UPDATE(epos)
+ MCFG_VIDEO_UPDATE(epos)
- 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_RGB32)
- MDRV_SCREEN_SIZE(272, 241)
- MDRV_SCREEN_VISIBLE_AREA(0, 271, 0, 235)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(272, 241)
+ MCFG_SCREEN_VISIBLE_AREA(0, 271, 0, 235)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 11000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 11000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dealer, epos_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 11000000/4) /* 2.75 MHz (see notes) */
- MDRV_CPU_PROGRAM_MAP(dealer_map)
- MDRV_CPU_IO_MAP(dealer_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 11000000/4) /* 2.75 MHz (see notes) */
+ MCFG_CPU_PROGRAM_MAP(dealer_map)
+ MCFG_CPU_IO_MAP(dealer_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_intf )
- MDRV_MACHINE_START(dealer)
- MDRV_MACHINE_RESET(epos)
+ MCFG_MACHINE_START(dealer)
+ MCFG_MACHINE_RESET(epos)
/* video hardware */
- MDRV_VIDEO_UPDATE(epos)
+ MCFG_VIDEO_UPDATE(epos)
- 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_RGB32)
- MDRV_SCREEN_SIZE(272, 241)
- MDRV_SCREEN_VISIBLE_AREA(0, 271, 0, 235)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(272, 241)
+ MCFG_SCREEN_VISIBLE_AREA(0, 271, 0, 235)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 11000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 11000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index f45be4599f7..36f7cac3952 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -409,99 +409,99 @@ GFXDECODE_END
static MACHINE_CONFIG_START( eprom, eprom_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(extra_map)
+ MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(extra_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(eprom)
- MDRV_MACHINE_RESET(eprom)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(eprom)
+ MCFG_MACHINE_RESET(eprom)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(eprom)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(eprom)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a SYNGEN chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(eprom)
- MDRV_VIDEO_UPDATE(eprom)
+ MCFG_VIDEO_START(eprom)
+ MCFG_VIDEO_UPDATE(eprom)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_i_mono_speech)
+ MCFG_FRAGMENT_ADD(jsa_i_mono_speech)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( klaxp, eprom_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(eprom)
- MDRV_MACHINE_RESET(eprom)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(eprom)
+ MCFG_MACHINE_RESET(eprom)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(eprom)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(eprom)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a SYNGEN chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(eprom)
- MDRV_VIDEO_UPDATE(eprom)
+ MCFG_VIDEO_START(eprom)
+ MCFG_VIDEO_UPDATE(eprom)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_ii_mono)
+ MCFG_FRAGMENT_ADD(jsa_ii_mono)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( guts, eprom_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(guts_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(guts_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(eprom)
- MDRV_MACHINE_RESET(eprom)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(eprom)
+ MCFG_MACHINE_RESET(eprom)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(guts)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(guts)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a SYNGEN chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(guts)
- MDRV_VIDEO_UPDATE(guts)
+ MCFG_VIDEO_START(guts)
+ MCFG_VIDEO_UPDATE(guts)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_ii_mono)
+ MCFG_FRAGMENT_ADD(jsa_ii_mono)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index d0a4661616c..92201c17d8f 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1142,42 +1142,42 @@ static const samples_interface alphamc07_samples_interface =
// the sound board is the same in all games
static MACHINE_CONFIG_FRAGMENT( common_sound )
- MDRV_CPU_ADD("audiocpu", I8085A, XTAL_6_144MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("audiocpu", I8085A, XTAL_6_144MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_SOUND_START(equites)
+ MCFG_SOUND_START(equites)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("msm", MSM5232, MSM5232_MAX_CLOCK) // will be adjusted at runtime through PORT_ADJUSTER
- MDRV_SOUND_CONFIG(equites_5232intf)
- MDRV_SOUND_ROUTE(0, "mono", MSM5232_BASE_VOLUME/2.2) // pin 28 2'-1 : 22k resistor
- MDRV_SOUND_ROUTE(1, "mono", MSM5232_BASE_VOLUME/1.5) // pin 29 4'-1 : 15k resistor
- MDRV_SOUND_ROUTE(2, "mono", MSM5232_BASE_VOLUME) // pin 30 8'-1 : 10k resistor
- MDRV_SOUND_ROUTE(3, "mono", MSM5232_BASE_VOLUME) // pin 31 16'-1 : 10k resistor
- MDRV_SOUND_ROUTE(4, "mono", MSM5232_BASE_VOLUME/2.2) // pin 36 2'-2 : 22k resistor
- MDRV_SOUND_ROUTE(5, "mono", MSM5232_BASE_VOLUME/1.5) // pin 35 4'-2 : 15k resistor
- MDRV_SOUND_ROUTE(6, "mono", MSM5232_BASE_VOLUME) // pin 34 8'-2 : 10k resistor
- MDRV_SOUND_ROUTE(7, "mono", MSM5232_BASE_VOLUME) // pin 33 16'-2 : 10k resistor
- MDRV_SOUND_ROUTE(8, "mono", 1.0) // pin 1 SOLO 8' (this actually feeds an analog section)
- MDRV_SOUND_ROUTE(9, "mono", 1.0) // pin 2 SOLO 16' (this actually feeds an analog section)
- MDRV_SOUND_ROUTE(10,"mono", 0.12) // pin 22 Noise Output (this actually feeds an analog section)
-
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_6_144MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(equites_8910intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(alphamc07_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("msm", MSM5232, MSM5232_MAX_CLOCK) // will be adjusted at runtime through PORT_ADJUSTER
+ MCFG_SOUND_CONFIG(equites_5232intf)
+ MCFG_SOUND_ROUTE(0, "mono", MSM5232_BASE_VOLUME/2.2) // pin 28 2'-1 : 22k resistor
+ MCFG_SOUND_ROUTE(1, "mono", MSM5232_BASE_VOLUME/1.5) // pin 29 4'-1 : 15k resistor
+ MCFG_SOUND_ROUTE(2, "mono", MSM5232_BASE_VOLUME) // pin 30 8'-1 : 10k resistor
+ MCFG_SOUND_ROUTE(3, "mono", MSM5232_BASE_VOLUME) // pin 31 16'-1 : 10k resistor
+ MCFG_SOUND_ROUTE(4, "mono", MSM5232_BASE_VOLUME/2.2) // pin 36 2'-2 : 22k resistor
+ MCFG_SOUND_ROUTE(5, "mono", MSM5232_BASE_VOLUME/1.5) // pin 35 4'-2 : 15k resistor
+ MCFG_SOUND_ROUTE(6, "mono", MSM5232_BASE_VOLUME) // pin 34 8'-2 : 10k resistor
+ MCFG_SOUND_ROUTE(7, "mono", MSM5232_BASE_VOLUME) // pin 33 16'-2 : 10k resistor
+ MCFG_SOUND_ROUTE(8, "mono", 1.0) // pin 1 SOLO 8' (this actually feeds an analog section)
+ MCFG_SOUND_ROUTE(9, "mono", 1.0) // pin 2 SOLO 16' (this actually feeds an analog section)
+ MCFG_SOUND_ROUTE(10,"mono", 0.12) // pin 22 Noise Output (this actually feeds an analog section)
+
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_6_144MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(equites_8910intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(alphamc07_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/******************************************************************************/
@@ -1245,37 +1245,37 @@ static MACHINE_RESET( equites )
static MACHINE_CONFIG_START( equites, equites_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */
- MDRV_CPU_PROGRAM_MAP(equites_map)
- MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(equites_map)
+ MCFG_CPU_VBLANK_INT_HACK(equites_interrupt, 2)
- MDRV_FRAGMENT_ADD(common_sound)
+ MCFG_FRAGMENT_ADD(common_sound)
- MDRV_CPU_ADD("mcu", ALPHA8301, 4000000/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", ALPHA8301, 4000000/8)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 3*8, 29*8-1)
-
- MDRV_GFXDECODE(equites)
- MDRV_PALETTE_LENGTH(0x180)
- MDRV_PALETTE_INIT(equites)
- MDRV_VIDEO_START(equites)
- MDRV_VIDEO_UPDATE(equites)
-
- MDRV_MACHINE_START(equites)
- MDRV_MACHINE_RESET(equites)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 3*8, 29*8-1)
+
+ MCFG_GFXDECODE(equites)
+ MCFG_PALETTE_LENGTH(0x180)
+ MCFG_PALETTE_INIT(equites)
+ MCFG_VIDEO_START(equites)
+ MCFG_VIDEO_UPDATE(equites)
+
+ MCFG_MACHINE_START(equites)
+ MCFG_MACHINE_RESET(equites)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gekisou, equites )
// gekisou has battery-backed RAM to store settings
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -1283,30 +1283,30 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( splndrbt, equites_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(splndrbt_map)
- MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(splndrbt_map)
+ MCFG_CPU_VBLANK_INT_HACK(equites_interrupt, 2)
- MDRV_FRAGMENT_ADD(common_sound)
+ MCFG_FRAGMENT_ADD(common_sound)
- MDRV_CPU_ADD("mcu", ALPHA8301, 4000000/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", ALPHA8301, 4000000/8)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
-
- MDRV_GFXDECODE(splndrbt)
- MDRV_PALETTE_LENGTH(0x280)
- MDRV_PALETTE_INIT(splndrbt)
- MDRV_VIDEO_START(splndrbt)
- MDRV_VIDEO_UPDATE(splndrbt)
-
- MDRV_MACHINE_START(equites)
- MDRV_MACHINE_RESET(equites)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
+
+ MCFG_GFXDECODE(splndrbt)
+ MCFG_PALETTE_LENGTH(0x280)
+ MCFG_PALETTE_INIT(splndrbt)
+ MCFG_VIDEO_START(splndrbt)
+ MCFG_VIDEO_UPDATE(splndrbt)
+
+ MCFG_MACHINE_START(equites)
+ MCFG_MACHINE_RESET(equites)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index d4d4566388d..b7d37dd66d6 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -208,51 +208,51 @@ static const i2cmem_interface i2cmem_interface =
static MACHINE_CONFIG_START( ertictac, driver_device )
- MDRV_CPU_ADD("maincpu", ARM, 8000000) /* guess */
- MDRV_CPU_PROGRAM_MAP(ertictac_map)
- MDRV_CPU_PERIODIC_INT(ertictac_podule_irq,60) // FIXME: timing of this
+ MCFG_CPU_ADD("maincpu", ARM, 8000000) /* guess */
+ MCFG_CPU_PROGRAM_MAP(ertictac_map)
+ MCFG_CPU_PERIODIC_INT(ertictac_podule_irq,60) // FIXME: timing of this
- MDRV_MACHINE_START(ertictac)
- MDRV_MACHINE_RESET(ertictac)
+ MCFG_MACHINE_START(ertictac)
+ MCFG_MACHINE_RESET(ertictac)
- MDRV_I2CMEM_ADD("i2cmem",i2cmem_interface)
+ MCFG_I2CMEM_ADD("i2cmem",i2cmem_interface)
- 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_RGB32)
- MDRV_SCREEN_SIZE(1280, 1024)
- MDRV_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 1024-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(1280, 1024)
+ MCFG_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 1024-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(archimds_vidc)
- MDRV_VIDEO_UPDATE(archimds_vidc)
+ MCFG_VIDEO_START(archimds_vidc)
+ MCFG_VIDEO_UPDATE(archimds_vidc)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac0", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac0", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac3", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac3", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac4", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac4", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac5", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac5", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac6", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac6", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac7", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac7", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
MACHINE_CONFIG_END
ROM_START( ertictac )
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index dc2b04e76a7..0dfea2ffb96 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -539,55 +539,55 @@ static MACHINE_RESET( esd16 )
static MACHINE_CONFIG_START( multchmp, esd16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(multchmp_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(multchmp_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(multchmp_sound_map)
- MDRV_CPU_IO_MAP(multchmp_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) /* IRQ By Main CPU */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(multchmp_sound_map)
+ MCFG_CPU_IO_MAP(multchmp_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) /* IRQ By Main CPU */
- MDRV_MACHINE_START(esd16)
- MDRV_MACHINE_RESET(esd16)
+ MCFG_MACHINE_START(esd16)
+ MCFG_MACHINE_RESET(esd16)
/* 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(0x140, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0+8, 0x100-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(0x140, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0+8, 0x100-8-1)
- MDRV_GFXDECODE(esd16)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(esd16)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(esd16)
- MDRV_VIDEO_UPDATE(esd16)
+ MCFG_VIDEO_START(esd16)
+ MCFG_VIDEO_UPDATE(esd16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hedpanic, multchmp )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hedpanic_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hedpanic_map)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_PALETTE_LENGTH(0x1000/2)
+ MCFG_PALETTE_LENGTH(0x1000/2)
- MDRV_GFXDECODE(hedpanic)
- MDRV_VIDEO_UPDATE(hedpanic)
+ MCFG_GFXDECODE(hedpanic)
+ MCFG_VIDEO_UPDATE(hedpanic)
MACHINE_CONFIG_END
@@ -595,32 +595,32 @@ static MACHINE_CONFIG_DERIVED( mchampdx, hedpanic )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mchampdx_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mchampdx_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tangtang, hedpanic )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tangtang_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tangtang_map)
- MDRV_GFXDECODE(tangtang)
+ MCFG_GFXDECODE(tangtang)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( swatpolc, hedpanic )
/* basic machine hardware */
- MDRV_GFXDECODE(tangtang)
+ MCFG_GFXDECODE(tangtang)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hedpanio, hedpanic )
/* basic machine hardware */
- MDRV_VIDEO_UPDATE(hedpanio)
+ MCFG_VIDEO_UPDATE(hedpanio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index bc7185e6dee..dbe2a589973 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -281,32 +281,32 @@ static MACHINE_START( esh )
static MACHINE_CONFIG_START( esh, driver_device )
/* main cpu */
- MDRV_CPU_ADD("maincpu", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */
- MDRV_CPU_PROGRAM_MAP(z80_0_mem)
- MDRV_CPU_IO_MAP(z80_0_io)
- MDRV_CPU_VBLANK_INT("screen", vblank_callback_esh)
+ MCFG_CPU_ADD("maincpu", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */
+ MCFG_CPU_PROGRAM_MAP(z80_0_mem)
+ MCFG_CPU_IO_MAP(z80_0_io)
+ MCFG_CPU_VBLANK_INT("screen", vblank_callback_esh)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(esh)
+ MCFG_MACHINE_START(esh)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(esh, 256, 256, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(esh, 256, 256, BITMAP_FORMAT_INDEXED16)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(esh)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(esh)
- MDRV_GFXDECODE(esh)
+ MCFG_GFXDECODE(esh)
/* sound 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
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index 323125b15de..5f93dad1509 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -327,51 +327,51 @@ GFXDECODE_END
static MACHINE_CONFIG_START( espial, espial_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(espial_map)
- MDRV_CPU_VBLANK_INT_HACK(espial_master_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(espial_map)
+ MCFG_CPU_VBLANK_INT_HACK(espial_master_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 2 MHz?????? */
- MDRV_CPU_PROGRAM_MAP(espial_sound_map)
- MDRV_CPU_IO_MAP(espial_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,4)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 2 MHz?????? */
+ MCFG_CPU_PROGRAM_MAP(espial_sound_map)
+ MCFG_CPU_IO_MAP(espial_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,4)
- MDRV_MACHINE_RESET(espial)
- MDRV_MACHINE_START(espial)
+ MCFG_MACHINE_RESET(espial)
+ MCFG_MACHINE_START(espial)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(espial)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(espial)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(espial)
- MDRV_VIDEO_START(espial)
- MDRV_VIDEO_UPDATE(espial)
+ MCFG_PALETTE_INIT(espial)
+ MCFG_VIDEO_START(espial)
+ MCFG_VIDEO_UPDATE(espial)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( netwars, espial )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(netwars_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(netwars_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(32*8, 64*8)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(32*8, 64*8)
- MDRV_VIDEO_START(netwars)
+ MCFG_VIDEO_START(netwars)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c
index 99b37f79bd9..ecb39f7486f 100644
--- a/src/mame/drivers/esripsys.c
+++ b/src/mame/drivers/esripsys.c
@@ -728,42 +728,42 @@ static const esrip_config rip_config =
};
static MACHINE_CONFIG_START( esripsys, driver_device )
- MDRV_CPU_ADD("game_cpu", M6809E, XTAL_8MHz)
- MDRV_CPU_PROGRAM_MAP(game_cpu_map)
- MDRV_CPU_VBLANK_INT("screen", esripsys_vblank_irq)
+ MCFG_CPU_ADD("game_cpu", M6809E, XTAL_8MHz)
+ MCFG_CPU_PROGRAM_MAP(game_cpu_map)
+ MCFG_CPU_VBLANK_INT("screen", esripsys_vblank_irq)
- MDRV_CPU_ADD("frame_cpu", M6809E, XTAL_8MHz)
- MDRV_CPU_PROGRAM_MAP(frame_cpu_map)
+ MCFG_CPU_ADD("frame_cpu", M6809E, XTAL_8MHz)
+ MCFG_CPU_PROGRAM_MAP(frame_cpu_map)
- MDRV_CPU_ADD("video_cpu", ESRIP, XTAL_40MHz / 4)
- MDRV_CPU_PROGRAM_MAP(video_cpu_map)
- MDRV_CPU_CONFIG(rip_config)
+ MCFG_CPU_ADD("video_cpu", ESRIP, XTAL_40MHz / 4)
+ MCFG_CPU_PROGRAM_MAP(video_cpu_map)
+ MCFG_CPU_CONFIG(rip_config)
- MDRV_CPU_ADD("sound_cpu", M6809E, XTAL_8MHz)
- MDRV_CPU_PROGRAM_MAP(sound_cpu_map)
+ MCFG_CPU_ADD("sound_cpu", M6809E, XTAL_8MHz)
+ MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* Video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(ESRIPSYS_PIXEL_CLOCK, ESRIPSYS_HTOTAL, ESRIPSYS_HBLANK_END, ESRIPSYS_HBLANK_START, ESRIPSYS_VTOTAL, ESRIPSYS_VBLANK_END, ESRIPSYS_VBLANK_START)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(ESRIPSYS_PIXEL_CLOCK, ESRIPSYS_HTOTAL, ESRIPSYS_HBLANK_END, ESRIPSYS_HBLANK_START, ESRIPSYS_VTOTAL, ESRIPSYS_VBLANK_END, ESRIPSYS_VBLANK_START)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(esripsys)
- MDRV_VIDEO_UPDATE(esripsys)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(esripsys)
+ MCFG_VIDEO_UPDATE(esripsys)
/* 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.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("tms5220nl", TMS5220, 640000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("tms5220nl", TMS5220, 640000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* 6840 PTM */
- MDRV_PTM6840_ADD("6840ptm", ptm_intf)
+ MCFG_PTM6840_ADD("6840ptm", ptm_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index ff39ff84b76..c93c2840387 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -239,41 +239,41 @@ static INTERRUPT_GEN( ettrivia_interrupt )
}
static MACHINE_CONFIG_START( ettrivia, driver_device )
- MDRV_CPU_ADD("maincpu", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected
- MDRV_CPU_PROGRAM_MAP(cpu_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", ettrivia_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", ettrivia_interrupt)
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(ettrivia)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(ettrivia)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(naughtyb)
- MDRV_VIDEO_START(ettrivia)
- MDRV_VIDEO_UPDATE(ettrivia)
+ MCFG_PALETTE_INIT(naughtyb)
+ MCFG_VIDEO_START(ettrivia)
+ MCFG_VIDEO_UPDATE(ettrivia)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8912_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8912_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay3", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8912_interface_3)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8912_interface_3)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
ROM_START( promutrv )
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index a3b57b9f064..b0ec7300759 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -215,46 +215,46 @@ static MACHINE_RESET( exedexes )
static MACHINE_CONFIG_START( exedexes, exedexes_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(exedexes_map)
- MDRV_CPU_VBLANK_INT_HACK(exedexes_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(exedexes_map)
+ MCFG_CPU_VBLANK_INT_HACK(exedexes_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
- MDRV_MACHINE_START(exedexes)
- MDRV_MACHINE_RESET(exedexes)
+ MCFG_MACHINE_START(exedexes)
+ MCFG_MACHINE_RESET(exedexes)
/* 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(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)
+ 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)
- MDRV_GFXDECODE(exedexes)
- MDRV_PALETTE_LENGTH(64*4+64*4+16*16+16*16)
+ MCFG_GFXDECODE(exedexes)
+ MCFG_PALETTE_LENGTH(64*4+64*4+16*16+16*16)
- MDRV_PALETTE_INIT(exedexes)
- MDRV_VIDEO_START(exedexes)
- MDRV_VIDEO_EOF(exedexes)
- MDRV_VIDEO_UPDATE(exedexes)
+ MCFG_PALETTE_INIT(exedexes)
+ MCFG_VIDEO_START(exedexes)
+ MCFG_VIDEO_EOF(exedexes)
+ MCFG_VIDEO_UPDATE(exedexes)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("sn1", SN76489, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36)
+ MCFG_SOUND_ADD("sn1", SN76489, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36)
- MDRV_SOUND_ADD("sn2", SN76489, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36)
+ MCFG_SOUND_ADD("sn2", SN76489, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index bbd1ab731ef..4ffcc4b1226 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -415,36 +415,36 @@ static MACHINE_RESET( exerion )
static MACHINE_CONFIG_START( exerion, exerion_state )
- MDRV_CPU_ADD("maincpu", Z80, EXERION_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", Z80, EXERION_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("sub", Z80, EXERION_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", Z80, EXERION_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_MACHINE_START(exerion)
- MDRV_MACHINE_RESET(exerion)
+ MCFG_MACHINE_START(exerion)
+ MCFG_MACHINE_RESET(exerion)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(EXERION_PIXEL_CLOCK, EXERION_HTOTAL, EXERION_HBEND, EXERION_HBSTART, EXERION_VTOTAL, EXERION_VBEND, EXERION_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(EXERION_PIXEL_CLOCK, EXERION_HTOTAL, EXERION_HBEND, EXERION_HBSTART, EXERION_VTOTAL, EXERION_VBEND, EXERION_VBSTART)
- MDRV_GFXDECODE(exerion)
- MDRV_PALETTE_LENGTH(256*3)
+ MCFG_GFXDECODE(exerion)
+ MCFG_PALETTE_LENGTH(256*3)
- MDRV_PALETTE_INIT(exerion)
- MDRV_VIDEO_START(exerion)
- MDRV_VIDEO_UPDATE(exerion)
+ MCFG_PALETTE_INIT(exerion)
+ MCFG_VIDEO_START(exerion)
+ MCFG_VIDEO_UPDATE(exerion)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, EXERION_AY8910_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, EXERION_AY8910_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, EXERION_AY8910_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, EXERION_AY8910_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index 7d50f3188d9..478fa18aef5 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -792,19 +792,19 @@ static MACHINE_START( teetert )
static MACHINE_CONFIG_START( base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, EXIDY_CPU_CLOCK)
- MDRV_CPU_VBLANK_INT("screen", exidy_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, EXIDY_CPU_CLOCK)
+ MCFG_CPU_VBLANK_INT("screen", exidy_vblank_interrupt)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(exidy)
- MDRV_VIDEO_UPDATE(exidy)
- MDRV_GFXDECODE(exidy)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(exidy)
+ MCFG_VIDEO_UPDATE(exidy)
+ MCFG_GFXDECODE(exidy)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(EXIDY_PIXEL_CLOCK, EXIDY_HTOTAL, EXIDY_HBEND, EXIDY_HBSTART, EXIDY_VTOTAL, EXIDY_VBEND, EXIDY_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(EXIDY_PIXEL_CLOCK, EXIDY_HTOTAL, EXIDY_HBEND, EXIDY_HBSTART, EXIDY_VTOTAL, EXIDY_VBEND, EXIDY_VBSTART)
MACHINE_CONFIG_END
@@ -812,64 +812,64 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sidetrac, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sidetrac_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sidetrac_map)
/* audio hardware */
- MDRV_FRAGMENT_ADD(spectar_audio)
+ MCFG_FRAGMENT_ADD(spectar_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( targ, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(targ_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(targ_map)
/* audio hardware */
- MDRV_FRAGMENT_ADD(targ_audio)
+ MCFG_FRAGMENT_ADD(targ_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spectar, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spectar_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spectar_map)
/* audio hardware */
- MDRV_FRAGMENT_ADD(spectar_audio)
+ MCFG_FRAGMENT_ADD(spectar_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rallys, spectar )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rallys_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rallys_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( venture, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(venture_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(venture_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* audio hardware */
- MDRV_FRAGMENT_ADD(venture_audio)
+ MCFG_FRAGMENT_ADD(venture_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( teetert, venture )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT_HACK(teetert_vblank_interrupt,10)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT_HACK(teetert_vblank_interrupt,10)
- MDRV_MACHINE_START( teetert )
+ MCFG_MACHINE_START( teetert )
MACHINE_CONFIG_END
@@ -878,26 +878,26 @@ static MACHINE_CONFIG_DERIVED( mtrap, venture )
/* basic machine hardware */
- MDRV_QUANTUM_TIME(HZ(1920))
+ MCFG_QUANTUM_TIME(HZ(1920))
/* audio hardware */
- MDRV_FRAGMENT_ADD(mtrap_cvsd_audio)
+ MCFG_FRAGMENT_ADD(mtrap_cvsd_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pepper2, venture )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pepper2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pepper2_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fax, pepper2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fax_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(fax_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index 3879765e6c0..b5b905f89df 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -986,19 +986,19 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( exidy440, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(exidy440_map)
- MDRV_CPU_VBLANK_INT("screen", exidy440_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(exidy440_map)
+ MCFG_CPU_VBLANK_INT("screen", exidy440_vblank_interrupt)
- MDRV_MACHINE_START(exidy440)
- MDRV_MACHINE_RESET(exidy440)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(exidy440)
+ MCFG_MACHINE_RESET(exidy440)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_FRAGMENT_ADD(exidy440_video)
+ MCFG_FRAGMENT_ADD(exidy440_video)
/* audio hardware */
- MDRV_FRAGMENT_ADD(exidy440_audio)
+ MCFG_FRAGMENT_ADD(exidy440_audio)
MACHINE_CONFIG_END
@@ -1007,7 +1007,7 @@ static MACHINE_CONFIG_DERIVED( topsecex, exidy440 )
/* basic machine hardware */
/* video hardware */
- MDRV_FRAGMENT_ADD(topsecex_video)
+ MCFG_FRAGMENT_ADD(topsecex_video)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index 7e1e83c16b9..7271290c2c7 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -478,36 +478,36 @@ GFXDECODE_END
static MACHINE_CONFIG_START( galsnew, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(galsnew_map)
- MDRV_CPU_VBLANK_INT_HACK(galsnew_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(galsnew_map)
+ MCFG_CPU_VBLANK_INT_HACK(galsnew_interrupt,3)
/* CALC01 MCU @ 16Mhz (unknown type, simulated) */
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-32-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-32-1)
- MDRV_GFXDECODE(1x4bit_1x4bit)
- MDRV_PALETTE_LENGTH(2048 + 32768)
- MDRV_MACHINE_RESET( galsnew )
+ MCFG_GFXDECODE(1x4bit_1x4bit)
+ MCFG_PALETTE_LENGTH(2048 + 32768)
+ MCFG_MACHINE_RESET( galsnew )
- MDRV_VIDEO_START(galsnew)
- MDRV_VIDEO_UPDATE(galsnew)
- MDRV_PALETTE_INIT(berlwall)
+ MCFG_VIDEO_START(galsnew)
+ MCFG_VIDEO_UPDATE(galsnew)
+ MCFG_PALETTE_INIT(berlwall)
/* arm watchdog */
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -515,10 +515,10 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fantasia, galsnew )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fantasia_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(fantasia_map)
- MDRV_WATCHDOG_TIME_INIT(SEC(0)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(0)) /* a guess, and certainly wrong */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index ee8cf29fa20..70ca10a6533 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -496,46 +496,46 @@ static MACHINE_RESET( exprraid )
static MACHINE_CONFIG_START( exprraid, exprraid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", DECO16, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_IO_MAP(master_io_map)
+ MCFG_CPU_ADD("maincpu", DECO16, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_IO_MAP(master_io_map)
- MDRV_CPU_ADD("slave", M6809, 2000000) /* 2 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_ADD("slave", M6809, 2000000) /* 2 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(slave_map)
/* IRQs are caused by the YM3526 */
- MDRV_MACHINE_START(exprraid)
- MDRV_MACHINE_RESET(exprraid)
+ MCFG_MACHINE_START(exprraid)
+ MCFG_MACHINE_RESET(exprraid)
/* 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(1*8, 31*8-1, 1*8, 31*8-1)
+ 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(1*8, 31*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(exprraid)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(exprraid)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(exprraid)
- MDRV_VIDEO_UPDATE(exprraid)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(exprraid)
+ MCFG_VIDEO_UPDATE(exprraid)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ym2", YM3526, 3600000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ym2", YM3526, 3600000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( exprboot, exprraid )
- MDRV_CPU_REPLACE("maincpu", M6502, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_REPLACE("maincpu", M6502, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(master_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 122448021b6..20273ba0d2c 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -450,44 +450,44 @@ static const tms34010_config slave_config =
static MACHINE_CONFIG_START( exterm, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, 40000000)
- MDRV_CPU_CONFIG(master_config)
- MDRV_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, 40000000)
+ MCFG_CPU_CONFIG(master_config)
+ MCFG_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_ADD("slave", TMS34010, 40000000)
- MDRV_CPU_CONFIG(slave_config)
- MDRV_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_ADD("slave", TMS34010, 40000000)
+ MCFG_CPU_CONFIG(slave_config)
+ MCFG_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_ADD("audiocpu", M6502, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_master_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound_master_map)
- MDRV_CPU_ADD("audioslave", M6502, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound_slave_map)
+ MCFG_CPU_ADD("audioslave", M6502, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound_slave_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_TIMER_ADD("snd_nmi_timer", master_sound_nmi_callback)
+ MCFG_TIMER_ADD("snd_nmi_timer", master_sound_nmi_callback)
/* video hardware */
- MDRV_PALETTE_LENGTH(2048+32768)
+ MCFG_PALETTE_LENGTH(2048+32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(40000000/8, 318, 0, 256, 264, 0, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(40000000/8, 318, 0, 256, 264, 0, 240)
- MDRV_PALETTE_INIT(exterm)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_PALETTE_INIT(exterm)
+ MCFG_VIDEO_UPDATE(tms340x0)
/* 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.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 01cf1b4df80..34d8efe3e29 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -283,46 +283,46 @@ static const tc0140syt_interface exzisus_tc0140syt_intf =
static MACHINE_CONFIG_START( exzisus, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("cpua", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(cpua_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("cpua", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(cpua_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("cpub", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("cpub", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("cpuc", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(cpuc_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("cpuc", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(cpuc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
/* 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)
+ 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)
- MDRV_GFXDECODE(exzisus)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(exzisus)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_UPDATE(exzisus)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_UPDATE(exzisus)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_TC0140SYT_ADD("tc0140syt", exzisus_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", exzisus_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index f562b1f7af8..4b32a9c3299 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -132,36 +132,36 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( mosaicf2, mosaicf2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(common_map)
- MDRV_CPU_IO_MAP(mosaicf2_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
+ MCFG_CPU_PROGRAM_MAP(common_map)
+ MCFG_CPU_IO_MAP(mosaicf2_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 223)
+ 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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 223)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_VIDEO_UPDATE(mosaicf2)
+ MCFG_VIDEO_UPDATE(mosaicf2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 14318180/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki", 1789772.5, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1789772.5, OKIM6295_PIN7_HIGH)
+ 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/f1gp.c b/src/mame/drivers/f1gp.c
index 40dd042ef11..d56676fcd7d 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -470,105 +470,105 @@ static MACHINE_RESET( f1gp )
static MACHINE_CONFIG_START( f1gp, f1gp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(f1gp_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(f1gp_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("sub", M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(f1gp_cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("sub", M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(f1gp_cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_20MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
- MDRV_MACHINE_START(f1gp)
- MDRV_MACHINE_RESET(f1gp)
+ MCFG_MACHINE_START(f1gp)
+ MCFG_MACHINE_RESET(f1gp)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(f1gp)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(f1gp)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(f1gp)
- MDRV_VIDEO_UPDATE(f1gp)
+ MCFG_VIDEO_START(f1gp)
+ MCFG_VIDEO_UPDATE(f1gp)
- MDRV_K053936_ADD("k053936", f1gp_k053936_intf)
+ MCFG_K053936_ADD("k053936", f1gp_k053936_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz)
- 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, XTAL_8MHz)
+ 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( f1gpb, f1gp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,10000000) /* 10 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(f1gpb_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,10000000) /* 10 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(f1gpb_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("sub", M68000,10000000) /* 10 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(f1gpb_cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("sub", M68000,10000000) /* 10 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(f1gpb_cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
/* NO sound CPU */
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
- MDRV_MACHINE_START(f1gpb)
- MDRV_MACHINE_RESET(f1gp)
+ MCFG_MACHINE_START(f1gpb)
+ MCFG_MACHINE_RESET(f1gp)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(f1gp)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(f1gp)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(f1gpb)
- MDRV_VIDEO_UPDATE(f1gpb)
+ MCFG_VIDEO_START(f1gpb)
+ MCFG_VIDEO_UPDATE(f1gpb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( f1gp2, f1gp )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(f1gp2_cpu1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(f1gp2_cpu1_map)
/* video hardware */
- MDRV_GFXDECODE(f1gp2)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_GFXDECODE(f1gp2)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_DEVICE_REMOVE("k053936")
- MDRV_K053936_ADD("k053936", f1gp2_k053936_intf)
+ MCFG_DEVICE_REMOVE("k053936")
+ MCFG_K053936_ADD("k053936", f1gp2_k053936_intf)
- MDRV_VIDEO_START(f1gp2)
- MDRV_VIDEO_UPDATE(f1gp2)
+ MCFG_VIDEO_START(f1gp2)
+ MCFG_VIDEO_UPDATE(f1gp2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 18b74cf449b..511ddd01f4f 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -855,43 +855,43 @@ static INTERRUPT_GEN( fantland_sound_irq )
static MACHINE_CONFIG_START( fantland, fantland_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8086, 8000000) // ?
- MDRV_CPU_PROGRAM_MAP(fantland_map)
- MDRV_CPU_VBLANK_INT("screen", fantland_irq)
-
- MDRV_CPU_ADD("audiocpu", I8088, 8000000) // ?
- MDRV_CPU_PROGRAM_MAP(fantland_sound_map)
- MDRV_CPU_IO_MAP(fantland_sound_iomap)
- MDRV_CPU_PERIODIC_INT(fantland_sound_irq, 8000)
+ MCFG_CPU_ADD("maincpu", I8086, 8000000) // ?
+ MCFG_CPU_PROGRAM_MAP(fantland_map)
+ MCFG_CPU_VBLANK_INT("screen", fantland_irq)
+
+ MCFG_CPU_ADD("audiocpu", I8088, 8000000) // ?
+ MCFG_CPU_PROGRAM_MAP(fantland_sound_map)
+ MCFG_CPU_IO_MAP(fantland_sound_iomap)
+ MCFG_CPU_PERIODIC_INT(fantland_sound_irq, 8000)
// NMI when soundlatch is written
- MDRV_MACHINE_START(fantland)
- MDRV_MACHINE_RESET(fantland)
+ MCFG_MACHINE_START(fantland)
+ MCFG_MACHINE_RESET(fantland)
- MDRV_QUANTUM_TIME(HZ(8000)) // sound irq must feed the DAC at 8kHz
+ MCFG_QUANTUM_TIME(HZ(8000)) // sound irq must feed the DAC at 8kHz
/* 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(352,256)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-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(352,256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1)
- MDRV_GFXDECODE(fantland)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(fantland)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(fantland)
+ MCFG_VIDEO_UPDATE(fantland)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.35)
- MDRV_SOUND_ROUTE(1, "mono", 0.35)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.35)
+ MCFG_SOUND_ROUTE(1, "mono", 0.35)
- 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
@@ -909,38 +909,38 @@ static const ym2151_interface galaxygn_ym2151_interface =
static MACHINE_CONFIG_START( galaxygn, fantland_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8088, 8000000) // ?
- MDRV_CPU_PROGRAM_MAP(galaxygn_map)
- MDRV_CPU_VBLANK_INT("screen", fantland_irq)
+ MCFG_CPU_ADD("maincpu", I8088, 8000000) // ?
+ MCFG_CPU_PROGRAM_MAP(galaxygn_map)
+ MCFG_CPU_VBLANK_INT("screen", fantland_irq)
- MDRV_CPU_ADD("audiocpu", I8088, 8000000) // ?
- MDRV_CPU_PROGRAM_MAP(fantland_sound_map)
- MDRV_CPU_IO_MAP(galaxygn_sound_iomap)
+ MCFG_CPU_ADD("audiocpu", I8088, 8000000) // ?
+ MCFG_CPU_PROGRAM_MAP(fantland_sound_map)
+ MCFG_CPU_IO_MAP(galaxygn_sound_iomap)
// IRQ by YM2151, NMI when soundlatch is written
- MDRV_MACHINE_START(fantland)
- MDRV_MACHINE_RESET(fantland)
+ MCFG_MACHINE_START(fantland)
+ MCFG_MACHINE_RESET(fantland)
/* 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(352,256)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-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(352,256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1)
- MDRV_GFXDECODE(fantland)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(fantland)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(fantland)
+ MCFG_VIDEO_UPDATE(fantland)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3000000)
- MDRV_SOUND_CONFIG(galaxygn_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3000000)
+ MCFG_SOUND_CONFIG(galaxygn_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1019,36 +1019,36 @@ static MACHINE_RESET( borntofi )
static MACHINE_CONFIG_START( borntofi, fantland_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2]
- MDRV_CPU_PROGRAM_MAP(borntofi_map)
- MDRV_CPU_VBLANK_INT("screen", fantland_irq)
+ MCFG_CPU_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2]
+ MCFG_CPU_PROGRAM_MAP(borntofi_map)
+ MCFG_CPU_VBLANK_INT("screen", fantland_irq)
- MDRV_CPU_ADD("audiocpu", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3]
- MDRV_CPU_PROGRAM_MAP(borntofi_sound_map)
+ MCFG_CPU_ADD("audiocpu", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3]
+ MCFG_CPU_PROGRAM_MAP(borntofi_sound_map)
- MDRV_MACHINE_START(borntofi)
- MDRV_MACHINE_RESET(borntofi)
+ MCFG_MACHINE_START(borntofi)
+ MCFG_MACHINE_RESET(borntofi)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54) // 54 Hz
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(352,256)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54) // 54 Hz
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(352,256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1)
- MDRV_GFXDECODE(fantland)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(fantland)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(fantland)
+ MCFG_VIDEO_UPDATE(fantland)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("msm1", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config_0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm2", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config_1) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm3", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config_2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm4", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config_3) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm1", MSM5205, 384000) MCFG_SOUND_CONFIG(msm5205_config_0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm2", MSM5205, 384000) MCFG_SOUND_CONFIG(msm5205_config_1) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm3", MSM5205, 384000) MCFG_SOUND_CONFIG(msm5205_config_2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm4", MSM5205, 384000) MCFG_SOUND_CONFIG(msm5205_config_3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1067,36 +1067,36 @@ static const ym3526_interface wheelrun_ym3526_interface =
static MACHINE_CONFIG_START( wheelrun, fantland_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V20, XTAL_18MHz/2) // D701080C-8 (V20)
- MDRV_CPU_PROGRAM_MAP(wheelrun_map)
- MDRV_CPU_VBLANK_INT("screen", fantland_irq)
+ MCFG_CPU_ADD("maincpu", V20, XTAL_18MHz/2) // D701080C-8 (V20)
+ MCFG_CPU_PROGRAM_MAP(wheelrun_map)
+ MCFG_CPU_VBLANK_INT("screen", fantland_irq)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B)
- MDRV_CPU_PROGRAM_MAP(wheelrun_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B)
+ MCFG_CPU_PROGRAM_MAP(wheelrun_sound_map)
// IRQ by YM3526, NMI when soundlatch is written
- MDRV_MACHINE_START(fantland)
- MDRV_MACHINE_RESET(fantland)
+ MCFG_MACHINE_START(fantland)
+ MCFG_MACHINE_RESET(fantland)
/* 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(256,224)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-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(256,224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
- MDRV_GFXDECODE(fantland)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(fantland)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(fantland)
+ MCFG_VIDEO_UPDATE(fantland)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, XTAL_14MHz/4)
- MDRV_SOUND_CONFIG(wheelrun_ym3526_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_14MHz/4)
+ MCFG_SOUND_CONFIG(wheelrun_ym3526_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index cdd8023eb00..49f4655e307 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -619,68 +619,68 @@ GFXDECODE_END
static MACHINE_CONFIG_START( fastfred, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(fastfred_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(fastfred_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80, CLOCK/12) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4)
+ MCFG_CPU_ADD("audiocpu", Z80, CLOCK/12) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) //CLOCK/16/60
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) //CLOCK/16/60
+ 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)
- MDRV_GFXDECODE(fastfred)
- MDRV_PALETTE_LENGTH(32*8)
+ MCFG_GFXDECODE(fastfred)
+ MCFG_PALETTE_LENGTH(32*8)
- MDRV_PALETTE_INIT(fastfred)
- MDRV_VIDEO_START(fastfred)
- MDRV_VIDEO_UPDATE(fastfred)
+ MCFG_PALETTE_INIT(fastfred)
+ MCFG_VIDEO_START(fastfred)
+ MCFG_VIDEO_UPDATE(fastfred)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910.1", AY8910, CLOCK/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay8910.1", AY8910, CLOCK/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay8910.2", AY8910, CLOCK/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay8910.2", AY8910, CLOCK/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jumpcoas, fastfred )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jumpcoas_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(jumpcoas_map)
- MDRV_DEVICE_REMOVE("audiocpu")
+ MCFG_DEVICE_REMOVE("audiocpu")
/* video hardware */
- MDRV_GFXDECODE(jumpcoas)
+ MCFG_GFXDECODE(jumpcoas)
/* sound hardware */
- MDRV_DEVICE_REMOVE("ay8910.2")
+ MCFG_DEVICE_REMOVE("ay8910.2")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( imago, fastfred )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(imago_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(imago_map)
- MDRV_MACHINE_START(imago)
+ MCFG_MACHINE_START(imago)
/* video hardware */
- MDRV_PALETTE_LENGTH(256+64+2) /* 256 for characters, 64 for the stars and 2 for the web */
- MDRV_GFXDECODE(imago)
+ MCFG_PALETTE_LENGTH(256+64+2) /* 256 for characters, 64 for the stars and 2 for the web */
+ MCFG_GFXDECODE(imago)
- MDRV_VIDEO_START(imago)
- MDRV_VIDEO_UPDATE(imago)
+ MCFG_VIDEO_START(imago)
+ MCFG_VIDEO_UPDATE(imago)
MACHINE_CONFIG_END
#undef CLOCK
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index c12204004f2..7646a3924b4 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -213,42 +213,42 @@ static MACHINE_START( fastlane )
static MACHINE_CONFIG_START( fastlane, fastlane_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
- MDRV_CPU_PROGRAM_MAP(fastlane_map)
- MDRV_CPU_VBLANK_INT_HACK(fastlane_interrupt,16) /* 1 IRQ + ??? NMI (generated by the 007121) */
+ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
+ MCFG_CPU_PROGRAM_MAP(fastlane_map)
+ MCFG_CPU_VBLANK_INT_HACK(fastlane_interrupt,16) /* 1 IRQ + ??? NMI (generated by the 007121) */
- MDRV_MACHINE_START(fastlane)
+ MCFG_MACHINE_START(fastlane)
/* 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(37*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 35*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(37*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(fastlane)
- MDRV_PALETTE_LENGTH(1024*16)
+ MCFG_GFXDECODE(fastlane)
+ MCFG_PALETTE_LENGTH(1024*16)
- MDRV_PALETTE_INIT(fastlane)
- MDRV_VIDEO_START(fastlane)
- MDRV_VIDEO_UPDATE(fastlane)
+ MCFG_PALETTE_INIT(fastlane)
+ MCFG_VIDEO_START(fastlane)
+ MCFG_VIDEO_UPDATE(fastlane)
- MDRV_K007121_ADD("k007121")
- MDRV_K051733_ADD("k051733")
+ MCFG_K007121_ADD("k007121")
+ MCFG_K051733_ADD("k051733")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("konami1", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_interface_1)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("konami1", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_interface_1)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD("konami2", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_interface_2)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("konami2", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_interface_2)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index c7453c25c92..20b4a37f9bc 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -298,38 +298,38 @@ static MACHINE_RESET( fcombat )
static MACHINE_CONFIG_START( fcombat, fcombat_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 10000000/3)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", Z80, 10000000/3)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("audiocpu", Z80, 10000000/3)
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 10000000/3)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_MACHINE_START(fcombat)
- MDRV_MACHINE_RESET(fcombat)
+ MCFG_MACHINE_START(fcombat)
+ MCFG_MACHINE_RESET(fcombat)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(FCOMBAT_PIXEL_CLOCK, FCOMBAT_HTOTAL, FCOMBAT_HBEND, FCOMBAT_HBSTART, FCOMBAT_VTOTAL, FCOMBAT_VBEND, FCOMBAT_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(FCOMBAT_PIXEL_CLOCK, FCOMBAT_HTOTAL, FCOMBAT_HBEND, FCOMBAT_HBSTART, FCOMBAT_VTOTAL, FCOMBAT_VBEND, FCOMBAT_VBSTART)
- MDRV_GFXDECODE(fcombat)
- MDRV_PALETTE_LENGTH(256*3)
+ MCFG_GFXDECODE(fcombat)
+ MCFG_PALETTE_LENGTH(256*3)
- MDRV_PALETTE_INIT(fcombat)
- MDRV_VIDEO_START(fcombat)
- MDRV_VIDEO_UPDATE(fcombat)
+ MCFG_PALETTE_INIT(fcombat)
+ MCFG_VIDEO_START(fcombat)
+ MCFG_VIDEO_UPDATE(fcombat)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD("ay3", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 34844c9544b..468fa48dc60 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -728,92 +728,92 @@ static MACHINE_RESET( fcrash )
static MACHINE_CONFIG_START( fcrash, cps_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(fcrash_map)
- MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(fcrash_map)
+ MCFG_CPU_VBLANK_INT("screen", cps1_interrupt)
- MDRV_CPU_ADD("soundcpu", Z80, 24000000/6) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 24000000/6) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(fcrash)
- MDRV_MACHINE_RESET(fcrash)
+ MCFG_MACHINE_START(fcrash)
+ MCFG_MACHINE_RESET(fcrash)
/* 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(8*8, (64-8)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(cps1)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(cps1)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(cps1)
- MDRV_VIDEO_EOF(cps1)
- MDRV_VIDEO_UPDATE(fcrash)
+ MCFG_VIDEO_START(cps1)
+ MCFG_VIDEO_EOF(cps1)
+ MCFG_VIDEO_UPDATE(fcrash)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 24000000/6) /* ? */
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
-
- MDRV_SOUND_ADD("ym2", YM2203, 24000000/6) /* ? */
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
-
- MDRV_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
- MDRV_SOUND_CONFIG(msm5205_interface1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-
- MDRV_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
- MDRV_SOUND_CONFIG(msm5205_interface2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 24000000/6) /* ? */
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 24000000/6) /* ? */
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
+
+ MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
+ MCFG_SOUND_CONFIG(msm5205_interface1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+
+ MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
+ MCFG_SOUND_CONFIG(msm5205_interface2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kodb, cps_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(kodb_map)
- MDRV_CPU_VBLANK_INT("screen", cps1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(kodb_map)
+ MCFG_CPU_VBLANK_INT("screen", cps1_interrupt)
-// MDRV_CPU_ADD("soundcpu", Z80, 3579545)
-// MDRV_CPU_PROGRAM_MAP(sub_map)
+// MCFG_CPU_ADD("soundcpu", Z80, 3579545)
+// MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_MACHINE_START(kodb)
+ MCFG_MACHINE_START(kodb)
/* 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(8*8, (64-8)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(cps1)
- MDRV_PALETTE_LENGTH(0xc00)
+ MCFG_GFXDECODE(cps1)
+ MCFG_PALETTE_LENGTH(0xc00)
- MDRV_VIDEO_START(cps1)
- MDRV_VIDEO_EOF(cps1)
- MDRV_VIDEO_UPDATE(kodb)
+ MCFG_VIDEO_START(cps1)
+ MCFG_VIDEO_EOF(cps1)
+ MCFG_VIDEO_UPDATE(kodb)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
+// MCFG_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("2151", YM2151, 3579545)
-// MDRV_SOUND_CONFIG(ym2151_config)
-// MDRV_SOUND_ROUTE(0, "mono", 0.35)
-// MDRV_SOUND_ROUTE(1, "mono", 0.35)
+// MCFG_SOUND_ADD("2151", YM2151, 3579545)
+// MCFG_SOUND_CONFIG(ym2151_config)
+// MCFG_SOUND_ROUTE(0, "mono", 0.35)
+// MCFG_SOUND_ROUTE(1, "mono", 0.35)
-// MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+// MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c
index 644ab9b7dfd..0921aceeab3 100644
--- a/src/mame/drivers/feversoc.c
+++ b/src/mame/drivers/feversoc.c
@@ -237,27 +237,27 @@ static INTERRUPT_GEN( feversoc_irq )
static MACHINE_CONFIG_START( feversoc, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",SH2,MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(feversoc_map)
- MDRV_CPU_VBLANK_INT("screen",feversoc_irq)
+ MCFG_CPU_ADD("maincpu",SH2,MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(feversoc_map)
+ MCFG_CPU_VBLANK_INT("screen",feversoc_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) //dynamic resolution?
- MDRV_GFXDECODE(feversoc)
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(feversoc)
- MDRV_VIDEO_UPDATE(feversoc)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) //dynamic resolution?
+ MCFG_GFXDECODE(feversoc)
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(feversoc)
+ MCFG_VIDEO_UPDATE(feversoc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", MASTER_CLOCK/16, OKIM6295_PIN7_LOW) //pin 7 & frequency not verified (clock should be 28,6363 / n)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/16, OKIM6295_PIN7_LOW) //pin 7 & frequency not verified (clock should be 28,6363 / n)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index d0a388728ea..478689e7f2d 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -370,28 +370,28 @@ static MACHINE_RESET( fgoal )
static MACHINE_CONFIG_START( fgoal, fgoal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, 10065000 / 10) /* ? */
- MDRV_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_ADD("maincpu", M6800, 10065000 / 10) /* ? */
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
- MDRV_MACHINE_START(fgoal)
- MDRV_MACHINE_RESET(fgoal)
+ MCFG_MACHINE_START(fgoal)
+ MCFG_MACHINE_RESET(fgoal)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 263)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 16, 255)
-
- MDRV_GFXDECODE(fgoal)
- MDRV_PALETTE_LENGTH(128 + 16 + 1)
-
- MDRV_PALETTE_INIT(fgoal)
- MDRV_VIDEO_START(fgoal)
- MDRV_VIDEO_UPDATE(fgoal)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 263)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 255)
+
+ MCFG_GFXDECODE(fgoal)
+ MCFG_PALETTE_LENGTH(128 + 16 + 1)
+
+ MCFG_PALETTE_INIT(fgoal)
+ MCFG_VIDEO_START(fgoal)
+ MCFG_VIDEO_UPDATE(fgoal)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index c3bff8df129..75c7b151ce5 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -270,40 +270,40 @@ static MACHINE_RESET( finalizr )
static MACHINE_CONFIG_START( finalizr, finalizr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809,XTAL_18_432MHz/6) /* ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(finalizr_interrupt,16) /* 1 IRQ + 8 NMI (generated by a custom IC) */
+ MCFG_CPU_ADD("maincpu", M6809,XTAL_18_432MHz/6) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(finalizr_interrupt,16) /* 1 IRQ + 8 NMI (generated by a custom IC) */
- MDRV_CPU_ADD("audiocpu", I8039,XTAL_18_432MHz/2) /* 9.216MHz clkin ?? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I8039,XTAL_18_432MHz/2) /* 9.216MHz clkin ?? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_MACHINE_START(finalizr)
- MDRV_MACHINE_RESET(finalizr)
+ MCFG_MACHINE_START(finalizr)
+ MCFG_MACHINE_RESET(finalizr)
/* 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(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 35*8-1, 2*8, 30*8-1)
+ 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(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 35*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(finalizr)
- MDRV_PALETTE_LENGTH(2*16*16)
+ MCFG_GFXDECODE(finalizr)
+ MCFG_PALETTE_LENGTH(2*16*16)
- MDRV_PALETTE_INIT(finalizr)
- MDRV_VIDEO_START(finalizr)
- MDRV_VIDEO_UPDATE(finalizr)
+ MCFG_PALETTE_INIT(finalizr)
+ MCFG_VIDEO_START(finalizr)
+ MCFG_VIDEO_UPDATE(finalizr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index a9309c340a6..7a769ce5f48 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1914,101 +1914,101 @@ static MACHINE_RESET( firebeat )
static MACHINE_CONFIG_START( firebeat, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GCX, 66000000)
- MDRV_CPU_PROGRAM_MAP(firebeat_map)
- MDRV_CPU_VBLANK_INT("screen", firebeat_interrupt)
+ MCFG_CPU_ADD("maincpu", PPC403GCX, 66000000)
+ MCFG_CPU_PROGRAM_MAP(firebeat_map)
+ MCFG_CPU_VBLANK_INT("screen", firebeat_interrupt)
- MDRV_MACHINE_START(firebeat)
- MDRV_MACHINE_RESET(firebeat)
+ MCFG_MACHINE_START(firebeat)
+ MCFG_MACHINE_RESET(firebeat)
- MDRV_RTC65271_ADD("rtc", NULL)
+ MCFG_RTC65271_ADD("rtc", NULL)
- MDRV_FUJITSU_29F016A_ADD("flash0")
- MDRV_FUJITSU_29F016A_ADD("flash1")
- MDRV_FUJITSU_29F016A_ADD("flash2")
+ MCFG_FUJITSU_29F016A_ADD("flash0")
+ MCFG_FUJITSU_29F016A_ADD("flash1")
+ MCFG_FUJITSU_29F016A_ADD("flash2")
/* 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ 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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_VIDEO_START(firebeat)
- MDRV_VIDEO_UPDATE(firebeat)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_VIDEO_START(firebeat)
+ MCFG_VIDEO_UPDATE(firebeat)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("cdda", CDDA, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("cdda", CDDA, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( firebeat2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GCX, 66000000)
- MDRV_CPU_PROGRAM_MAP(firebeat_map)
- MDRV_CPU_VBLANK_INT("lscreen", firebeat_interrupt)
+ MCFG_CPU_ADD("maincpu", PPC403GCX, 66000000)
+ MCFG_CPU_PROGRAM_MAP(firebeat_map)
+ MCFG_CPU_VBLANK_INT("lscreen", firebeat_interrupt)
- MDRV_MACHINE_START(firebeat)
- MDRV_MACHINE_RESET(firebeat)
+ MCFG_MACHINE_START(firebeat)
+ MCFG_MACHINE_RESET(firebeat)
- MDRV_RTC65271_ADD("rtc", NULL)
+ MCFG_RTC65271_ADD("rtc", NULL)
- MDRV_FUJITSU_29F016A_ADD("flash0")
- MDRV_FUJITSU_29F016A_ADD("flash1")
- MDRV_FUJITSU_29F016A_ADD("flash2")
+ MCFG_FUJITSU_29F016A_ADD("flash0")
+ MCFG_FUJITSU_29F016A_ADD("flash1")
+ MCFG_FUJITSU_29F016A_ADD("flash2")
/* video hardware */
- MDRV_PALETTE_LENGTH(32768)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
-
- MDRV_VIDEO_START(firebeat)
- MDRV_VIDEO_UPDATE(firebeat)
+ MCFG_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+
+ MCFG_VIDEO_START(firebeat)
+ MCFG_VIDEO_UPDATE(firebeat)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("cdda", CDDA, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("cdda", CDDA, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( firebeat_spu, firebeat )
- MDRV_CPU_ADD("audiocpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(spu_map)
+ MCFG_CPU_ADD("audiocpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(spu_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index f209ef2db97..7432776c495 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -644,61 +644,61 @@ static const riot6532_interface riot_intf =
static MACHINE_CONFIG_START( firefox, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809E, MASTER_XTAL/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6809E, MASTER_XTAL/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
/* interrupts count starting at end of VBLANK, which is 44, so add 44 */
- MDRV_TIMER_ADD_SCANLINE("32v", video_timer_callback, "screen", 96+44, 128)
+ MCFG_TIMER_ADD_SCANLINE("32v", video_timer_callback, "screen", 96+44, 128)
- MDRV_CPU_ADD("audiocpu", M6502, MASTER_XTAL/8)
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, MASTER_XTAL/8)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_QUANTUM_TIME(HZ(60000))
+ MCFG_QUANTUM_TIME(HZ(60000))
- MDRV_MACHINE_START(firefox)
- MDRV_WATCHDOG_TIME_INIT(HZ((double)MASTER_XTAL/8/16/16/16/16))
+ MCFG_MACHINE_START(firefox)
+ MCFG_WATCHDOG_TIME_INIT(HZ((double)MASTER_XTAL/8/16/16/16/16))
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
- MDRV_GFXDECODE(firefox)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(firefox)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(firefox)
+ MCFG_VIDEO_START(firefox)
- MDRV_LASERDISC_ADD("laserdisc", PHILLIPS_22VP931, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(firefox, 64*8, 525, BITMAP_FORMAT_RGB32)
- MDRV_LASERDISC_OVERLAY_CLIP(7*8, 53*8-1, 44, 480+44)
+ MCFG_LASERDISC_ADD("laserdisc", PHILLIPS_22VP931, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(firefox, 64*8, 525, BITMAP_FORMAT_RGB32)
+ MCFG_LASERDISC_OVERLAY_CLIP(7*8, 53*8-1, 44, 480+44)
- MDRV_X2212_ADD_AUTOSAVE("nvram_1c")
- MDRV_X2212_ADD_AUTOSAVE("nvram_1d")
- MDRV_RIOT6532_ADD("riot", MASTER_XTAL/8, riot_intf)
+ MCFG_X2212_ADD_AUTOSAVE("nvram_1c")
+ MCFG_X2212_ADD_AUTOSAVE("nvram_1d")
+ MCFG_RIOT6532_ADD("riot", MASTER_XTAL/8, riot_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_XTAL/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_XTAL/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_XTAL/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_XTAL/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("pokey3", POKEY, MASTER_XTAL/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey3", POKEY, MASTER_XTAL/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("pokey4", POKEY, MASTER_XTAL/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey4", POKEY, MASTER_XTAL/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("tms", TMS5220, MASTER_XTAL/2/11)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("tms", TMS5220, MASTER_XTAL/2/11)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index a27efa99b24..7908750d9be 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -675,83 +675,83 @@ static MACHINE_RESET( firetrap )
static MACHINE_CONFIG_START( firetrap, firetrap_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(firetrap_map)
- MDRV_CPU_VBLANK_INT_HACK(firetrap,2)
+ MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
+ MCFG_CPU_PROGRAM_MAP(firetrap_map)
+ MCFG_CPU_VBLANK_INT_HACK(firetrap,2)
- MDRV_CPU_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
- MDRV_MACHINE_START(firetrap)
- MDRV_MACHINE_RESET(firetrap)
+ MCFG_MACHINE_START(firetrap)
+ MCFG_MACHINE_RESET(firetrap)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.4034) // PCB measurement
- 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(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.4034) // PCB measurement
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(firetrap)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(firetrap)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(firetrap)
- MDRV_VIDEO_START(firetrap)
- MDRV_VIDEO_UPDATE(firetrap)
+ MCFG_PALETTE_INIT(firetrap)
+ MCFG_VIDEO_START(firetrap)
+ MCFG_VIDEO_UPDATE(firetrap)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, FIRETRAP_XTAL/4) // 3 MHz
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, FIRETRAP_XTAL/4) // 3 MHz
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( firetrapbl, firetrap_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(firetrap_bootleg_map)
- MDRV_CPU_VBLANK_INT("screen", bootleg)
+ MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
+ MCFG_CPU_PROGRAM_MAP(firetrap_bootleg_map)
+ MCFG_CPU_VBLANK_INT("screen", bootleg)
- MDRV_CPU_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
- MDRV_MACHINE_START(firetrap)
- MDRV_MACHINE_RESET(firetrap)
+ MCFG_MACHINE_START(firetrap)
+ MCFG_MACHINE_RESET(firetrap)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.4034)
- 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(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.4034)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(firetrap)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(firetrap)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(firetrap)
- MDRV_VIDEO_START(firetrap)
- MDRV_VIDEO_UPDATE(firetrap)
+ MCFG_PALETTE_INIT(firetrap)
+ MCFG_VIDEO_START(firetrap)
+ MCFG_VIDEO_UPDATE(firetrap)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, FIRETRAP_XTAL/4) // 3 MHz
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, FIRETRAP_XTAL/4) // 3 MHz
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index f0d9a75bcea..963b86f4d89 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -879,74 +879,74 @@ GFXDECODE_END
static MACHINE_CONFIG_START( firetrk, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, MASTER_CLOCK/12) /* 750Khz during service mode */
- MDRV_CPU_PROGRAM_MAP(firetrk_map)
- MDRV_CPU_VBLANK_INT("screen", firetrk_interrupt)
- MDRV_WATCHDOG_VBLANK_INIT(5)
+ MCFG_CPU_ADD("maincpu", M6800, MASTER_CLOCK/12) /* 750Khz during service mode */
+ MCFG_CPU_PROGRAM_MAP(firetrk_map)
+ MCFG_CPU_VBLANK_INT("screen", firetrk_interrupt)
+ MCFG_WATCHDOG_VBLANK_INIT(5)
- MDRV_MACHINE_RESET(firetrk)
+ MCFG_MACHINE_RESET(firetrk)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_VIDEO_START(firetrk)
- MDRV_VIDEO_UPDATE(firetrk)
- MDRV_PALETTE_INIT(firetrk)
- MDRV_PALETTE_LENGTH(28)
- MDRV_GFXDECODE(firetrk)
+ MCFG_VIDEO_START(firetrk)
+ MCFG_VIDEO_UPDATE(firetrk)
+ MCFG_PALETTE_INIT(firetrk)
+ MCFG_PALETTE_LENGTH(28)
+ MCFG_GFXDECODE(firetrk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(firetrk)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(firetrk)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( superbug, firetrk )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(superbug_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(superbug_map)
/* video hardware */
- MDRV_VIDEO_START(superbug)
- MDRV_VIDEO_UPDATE(superbug)
- MDRV_GFXDECODE(superbug)
- MDRV_PALETTE_LENGTH(28)
+ MCFG_VIDEO_START(superbug)
+ MCFG_VIDEO_UPDATE(superbug)
+ MCFG_GFXDECODE(superbug)
+ MCFG_PALETTE_LENGTH(28)
/* sound hardware */
- MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(superbug)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(superbug)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( montecar, firetrk )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu") /* 750Khz during service mode */
- MDRV_CPU_PROGRAM_MAP(montecar_map)
+ MCFG_CPU_MODIFY("maincpu") /* 750Khz during service mode */
+ MCFG_CPU_PROGRAM_MAP(montecar_map)
/* video hardware */
- MDRV_VIDEO_START(montecar)
- MDRV_VIDEO_UPDATE(montecar)
- MDRV_GFXDECODE(montecar)
+ MCFG_VIDEO_START(montecar)
+ MCFG_VIDEO_UPDATE(montecar)
+ MCFG_GFXDECODE(montecar)
- MDRV_PALETTE_INIT(montecar)
- MDRV_PALETTE_LENGTH(46)
+ MCFG_PALETTE_INIT(montecar)
+ MCFG_PALETTE_LENGTH(46)
/* sound hardware */
- MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(montecar)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(montecar)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 5c48401cc74..17d62423250 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -733,66 +733,66 @@ static MACHINE_RESET( fitfight )
static MACHINE_CONFIG_START( fitfight, fitfight_state )
- MDRV_CPU_ADD("maincpu",M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(fitfight_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(fitfight_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(sound_cpu_config)
- MDRV_CPU_PROGRAM_MAP(snd_mem)
- MDRV_CPU_IO_MAP(snd_io)
- MDRV_CPU_VBLANK_INT("screen", snd_irq)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(sound_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(snd_mem)
+ MCFG_CPU_IO_MAP(snd_io)
+ MCFG_CPU_VBLANK_INT("screen", snd_irq)
- MDRV_MACHINE_START(fitfight)
- MDRV_MACHINE_RESET(fitfight)
+ MCFG_MACHINE_START(fitfight)
+ MCFG_MACHINE_RESET(fitfight)
- MDRV_GFXDECODE(fitfight)
+ MCFG_GFXDECODE(fitfight)
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 39*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 39*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(fitfight)
- MDRV_VIDEO_UPDATE(fitfight)
+ MCFG_VIDEO_START(fitfight)
+ MCFG_VIDEO_UPDATE(fitfight)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bbprot, fitfight_state )
- MDRV_CPU_ADD("maincpu",M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(bbprot_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(bbprot_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_MACHINE_START(fitfight)
- MDRV_MACHINE_RESET(fitfight)
+ MCFG_MACHINE_START(fitfight)
+ MCFG_MACHINE_RESET(fitfight)
- MDRV_GFXDECODE(prot)
+ MCFG_GFXDECODE(prot)
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 39*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 39*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(fitfight)
- MDRV_VIDEO_UPDATE(fitfight)
+ MCFG_VIDEO_START(fitfight)
+ MCFG_VIDEO_UPDATE(fitfight)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index d1b01f7ac9b..305f0b5054a 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -225,47 +225,47 @@ static MACHINE_RESET( flkatck )
static MACHINE_CONFIG_START( flkatck, flkatck_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */
- MDRV_CPU_PROGRAM_MAP(flkatck_map)
- MDRV_CPU_VBLANK_INT("screen", flkatck_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */
+ MCFG_CPU_PROGRAM_MAP(flkatck_map)
+ MCFG_CPU_VBLANK_INT("screen", flkatck_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,3579545) /* NEC D780C-1, 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(flkatck_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,3579545) /* NEC D780C-1, 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(flkatck_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(flkatck)
- MDRV_MACHINE_RESET(flkatck)
+ MCFG_MACHINE_START(flkatck)
+ MCFG_MACHINE_RESET(flkatck)
/* 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(37*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 35*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(37*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(flkatck)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(flkatck)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(flkatck)
- MDRV_VIDEO_UPDATE(flkatck)
+ MCFG_VIDEO_START(flkatck)
+ MCFG_VIDEO_UPDATE(flkatck)
- MDRV_K007121_ADD("k007121")
+ MCFG_K007121_ADD("k007121")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("konami", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("konami", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index b7947519e2e..d23a12dce69 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -241,41 +241,41 @@ static INTERRUPT_GEN( flower_cpu0_interrupt )
static MACHINE_CONFIG_START( flower, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(flower_cpu1_2)
-// MDRV_CPU_VBLANK_INT_HACK(flower_cpu0_interrupt,10)
- MDRV_CPU_VBLANK_INT("screen", flower_cpu0_interrupt) //nmis stuff up the writes to shared ram
+ MCFG_CPU_ADD("maincpu", Z80,8000000)
+ MCFG_CPU_PROGRAM_MAP(flower_cpu1_2)
+// MCFG_CPU_VBLANK_INT_HACK(flower_cpu0_interrupt,10)
+ MCFG_CPU_VBLANK_INT("screen", flower_cpu0_interrupt) //nmis stuff up the writes to shared ram
- MDRV_CPU_ADD("sub", Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(flower_cpu1_2)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("sub", Z80,8000000)
+ MCFG_CPU_PROGRAM_MAP(flower_cpu1_2)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+// MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(flower_sound_cpu)
- MDRV_CPU_PERIODIC_INT(sn_irq, 90) /* periodic interrupt, don't know about the frequency */
+ MCFG_CPU_ADD("audiocpu", Z80,8000000)
+ MCFG_CPU_PROGRAM_MAP(flower_sound_cpu)
+ MCFG_CPU_PERIODIC_INT(sn_irq, 90) /* periodic interrupt, don't know about the frequency */
/* 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(34*8, 33*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 34*8-1, 0*8, 28*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(34*8, 33*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 34*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(flower)
+ MCFG_GFXDECODE(flower)
- MDRV_PALETTE_INIT(flower)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(flower)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(flower)
- MDRV_VIDEO_UPDATE(flower)
+ MCFG_VIDEO_START(flower)
+ MCFG_VIDEO_UPDATE(flower)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("flower", FLOWER, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("flower", FLOWER, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 73038df0b46..ee5ce9de6c9 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -1087,176 +1087,176 @@ static MACHINE_RESET( flstory )
static MACHINE_CONFIG_START( flstory, flstory_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,XTAL_10_733MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(flstory_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_10_733MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(flstory_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
- MDRV_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(flstory_m68705_map)
+ MCFG_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(flstory_m68705_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(flstory)
- MDRV_MACHINE_RESET(flstory)
+ MCFG_MACHINE_START(flstory)
+ MCFG_MACHINE_RESET(flstory)
/* 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)
+ 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)
- MDRV_GFXDECODE(flstory)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(flstory)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(flstory)
- MDRV_VIDEO_UPDATE(flstory)
+ MCFG_VIDEO_START(flstory)
+ MCFG_VIDEO_UPDATE(flstory)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_8MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
-
- MDRV_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4) /* verified on pcb */
- 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, XTAL_8MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+
+ MCFG_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4) /* verified on pcb */
+ 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( onna34ro, flstory_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,10733000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(onna34ro_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,10733000/2) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(onna34ro_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
-// MDRV_CPU_ADD("mcu", M68705,4000000) /* ??? */
-// MDRV_CPU_PROGRAM_MAP(m68705_map)
+// MCFG_CPU_ADD("mcu", M68705,4000000) /* ??? */
+// MCFG_CPU_PROGRAM_MAP(m68705_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(flstory)
- MDRV_MACHINE_RESET(flstory)
+ MCFG_MACHINE_START(flstory)
+ MCFG_MACHINE_RESET(flstory)
/* 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)
+ 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)
- MDRV_GFXDECODE(flstory)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(flstory)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(flstory)
- MDRV_VIDEO_UPDATE(flstory)
+ MCFG_VIDEO_START(flstory)
+ MCFG_VIDEO_UPDATE(flstory)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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( victnine, flstory_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(victnine_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(victnine_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
-// MDRV_CPU_ADD("mcu", M68705,4000000) /* ??? */
-// MDRV_CPU_PROGRAM_MAP(m68705_map)
+// MCFG_CPU_ADD("mcu", M68705,4000000) /* ??? */
+// MCFG_CPU_PROGRAM_MAP(m68705_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(flstory)
- MDRV_MACHINE_RESET(flstory)
+ MCFG_MACHINE_START(flstory)
+ MCFG_MACHINE_RESET(flstory)
/* 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)
+ 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)
- MDRV_GFXDECODE(flstory)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(flstory)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(victnine)
- MDRV_VIDEO_UPDATE(victnine)
+ MCFG_VIDEO_START(victnine)
+ MCFG_VIDEO_UPDATE(victnine)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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_RESET( rumba )
@@ -1268,60 +1268,60 @@ static MACHINE_RESET( rumba )
static MACHINE_CONFIG_START( rumba, flstory_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(rumba_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(rumba_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
-// MDRV_CPU_ADD("mcu", M68705,18432000/6) /* ??? */
+// MCFG_CPU_ADD("mcu", M68705,18432000/6) /* ??? */
-// MDRV_CPU_PROGRAM_MAP(m68705_map)
+// MCFG_CPU_PROGRAM_MAP(m68705_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(flstory)
- MDRV_MACHINE_RESET(rumba)
+ MCFG_MACHINE_START(flstory)
+ MCFG_MACHINE_RESET(rumba)
/* 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)
+ 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)
- MDRV_GFXDECODE(flstory)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(flstory)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(rumba)
- MDRV_VIDEO_UPDATE(rumba)
+ MCFG_VIDEO_START(rumba)
+ MCFG_VIDEO_UPDATE(rumba)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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/flyball.c b/src/mame/drivers/flyball.c
index 83d4e2f5f04..021f41550b0 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -402,26 +402,26 @@ static MACHINE_RESET( flyball )
static MACHINE_CONFIG_START( flyball, flyball_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16)
- MDRV_CPU_PROGRAM_MAP(flyball_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16)
+ MCFG_CPU_PROGRAM_MAP(flyball_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(flyball)
- MDRV_MACHINE_RESET(flyball)
+ MCFG_MACHINE_START(flyball)
+ MCFG_MACHINE_RESET(flyball)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
-
- MDRV_GFXDECODE(flyball)
- MDRV_PALETTE_LENGTH(4)
-
- MDRV_PALETTE_INIT(flyball)
- MDRV_VIDEO_UPDATE(flyball)
- MDRV_VIDEO_START(flyball)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+
+ MCFG_GFXDECODE(flyball)
+ MCFG_PALETTE_LENGTH(4)
+
+ MCFG_PALETTE_INIT(flyball)
+ MCFG_VIDEO_UPDATE(flyball)
+ MCFG_VIDEO_START(flyball)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index c4717d2f6aa..4abbeb6aa38 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -358,42 +358,42 @@ static const pokey_interface pokey_config =
static MACHINE_CONFIG_START( foodf, foodf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(foodf)
- MDRV_MACHINE_RESET(foodf)
+ MCFG_MACHINE_START(foodf)
+ MCFG_MACHINE_RESET(foodf)
- MDRV_X2212_ADD_AUTOSAVE("nvram")
+ MCFG_X2212_ADD_AUTOSAVE("nvram")
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
- MDRV_TIMER_ADD("scan_timer", scanline_update)
+ MCFG_TIMER_ADD("scan_timer", scanline_update)
/* video hardware */
- MDRV_GFXDECODE(foodf)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(foodf)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 256, 259, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 256, 259, 0, 224)
- MDRV_VIDEO_START(foodf)
- MDRV_VIDEO_UPDATE(foodf)
+ MCFG_VIDEO_START(foodf)
+ MCFG_VIDEO_UPDATE(foodf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/2/10)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/2/10)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/2/10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/2/10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MDRV_SOUND_ADD("pokey3", POKEY, MASTER_CLOCK/2/10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("pokey3", POKEY, MASTER_CLOCK/2/10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c
index c8d77fcabc4..d9792fc8b12 100644
--- a/src/mame/drivers/forte2.c
+++ b/src/mame/drivers/forte2.c
@@ -123,26 +123,26 @@ static INTERRUPT_GEN( pesadelo_interrupt )
static MACHINE_CONFIG_START( pesadelo, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, 3579545) /* 3.579545 Mhz */
- MDRV_CPU_PROGRAM_MAP(program_mem)
- MDRV_CPU_IO_MAP(io_mem)
- MDRV_CPU_VBLANK_INT("screen",pesadelo_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 3579545) /* 3.579545 Mhz */
+ MCFG_CPU_PROGRAM_MAP(program_mem)
+ MCFG_CPU_IO_MAP(io_mem)
+ MCFG_CPU_VBLANK_INT("screen",pesadelo_interrupt)
- MDRV_MACHINE_START( forte2 )
- MDRV_MACHINE_RESET( forte2 )
+ MCFG_MACHINE_START( forte2 )
+ MCFG_MACHINE_RESET( forte2 )
/* video hardware */
- MDRV_FRAGMENT_ADD(tms9928a)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE((float)XTAL_10_738635MHz/2/342/262)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(4395)) /* 69 lines */
+ MCFG_FRAGMENT_ADD(tms9928a)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE((float)XTAL_10_738635MHz/2/342/262)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(4395)) /* 69 lines */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, (float)XTAL_3_579545MHz/2)
- MDRV_SOUND_CONFIG(forte2_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, (float)XTAL_3_579545MHz/2)
+ MCFG_SOUND_CONFIG(forte2_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static DRIVER_INIT(pesadelo)
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index f5a231c3600..5bab8a42a08 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -279,40 +279,40 @@ static const mc6845_interface mc6845_intf =
//51f
static MACHINE_CONFIG_START( fortecar, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(fortecar_map)
- MDRV_CPU_IO_MAP(fortecar_ports)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(fortecar_map)
+ MCFG_CPU_IO_MAP(fortecar_ports)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 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(640, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-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(640, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
- MDRV_MACHINE_RESET(fortecar)
+ MCFG_MACHINE_RESET(fortecar)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DEFAULT_VALUE(0)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DEFAULT_VALUE(0)
- MDRV_PPI8255_ADD("fcppi0", ppi0intf)
+ MCFG_PPI8255_ADD("fcppi0", ppi0intf)
- MDRV_GFXDECODE(fortecar)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(fortecar)
+ MCFG_GFXDECODE(fortecar)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(fortecar)
- MDRV_VIDEO_START(fortecar)
- MDRV_VIDEO_UPDATE(fortecar)
+ MCFG_VIDEO_START(fortecar)
+ MCFG_VIDEO_UPDATE(fortecar)
- MDRV_MC6845_ADD("crtc", MC6845, 6000000/4, mc6845_intf) /* unknown type / hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", MC6845, 6000000/4, mc6845_intf) /* unknown type / hand tuned to get ~60 fps */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
ROM_START( fortecar )
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 7360ffe134b..f6aaf79a2a3 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -645,81 +645,81 @@ static MACHINE_RESET( oigas )
static MACHINE_CONFIG_START( base, freekick_state )
- MDRV_CPU_ADD("maincpu",Z80, 18432000/6) //confirmed
- MDRV_CPU_PROGRAM_MAP(pbillrd_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 50*3) //??
- MDRV_CPU_VBLANK_INT("screen", freekick_irqgen)
+ MCFG_CPU_ADD("maincpu",Z80, 18432000/6) //confirmed
+ MCFG_CPU_PROGRAM_MAP(pbillrd_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 50*3) //??
+ MCFG_CPU_VBLANK_INT("screen", freekick_irqgen)
- MDRV_GFXDECODE(freekick)
+ MCFG_GFXDECODE(freekick)
- 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)
+ 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)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(freekick)
- MDRV_VIDEO_UPDATE(pbillrd)
+ MCFG_VIDEO_START(freekick)
+ MCFG_VIDEO_UPDATE(pbillrd)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 12000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76496, 12000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76496, 12000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76496, 12000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn3", SN76496, 12000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn3", SN76496, 12000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn4", SN76496, 12000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn4", SN76496, 12000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pbillrd, base )
- MDRV_MACHINE_START(pbillrd)
- MDRV_MACHINE_RESET(freekick)
+ MCFG_MACHINE_START(pbillrd)
+ MCFG_MACHINE_RESET(freekick)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( freekickb, base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(freekickb_map)
- MDRV_CPU_IO_MAP(freekickb_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(freekickb_map)
+ MCFG_CPU_IO_MAP(freekickb_io_map)
- MDRV_MACHINE_START(freekick)
- MDRV_MACHINE_RESET(freekick)
+ MCFG_MACHINE_START(freekick)
+ MCFG_MACHINE_RESET(freekick)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- MDRV_VIDEO_UPDATE(freekick)
+ MCFG_VIDEO_UPDATE(freekick)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gigas, base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gigas_map)
- MDRV_CPU_IO_MAP(gigas_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gigas_map)
+ MCFG_CPU_IO_MAP(gigas_io_map)
- MDRV_MACHINE_START(freekick)
- MDRV_MACHINE_RESET(freekick)
+ MCFG_MACHINE_START(freekick)
+ MCFG_MACHINE_RESET(freekick)
- MDRV_VIDEO_UPDATE(gigas)
+ MCFG_VIDEO_UPDATE(gigas)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( oigas, gigas )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(oigas_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(oigas_io_map)
- MDRV_MACHINE_START(oigas)
- MDRV_MACHINE_RESET(oigas)
+ MCFG_MACHINE_START(oigas)
+ MCFG_MACHINE_RESET(oigas)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 9782181cd1f..ea2cf74032e 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -559,154 +559,154 @@ static MACHINE_RESET( fromanc2 )
static MACHINE_CONFIG_START( fromanc2, fromanc2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_main_map)
- MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(fromanc2_main_map)
+ MCFG_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map)
- MDRV_CPU_IO_MAP(fromanc2_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(fromanc2_sound_map)
+ MCFG_CPU_IO_MAP(fromanc2_sound_io_map)
- MDRV_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sub_map)
- MDRV_CPU_IO_MAP(fromanc2_sub_io_map)
+ MCFG_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(fromanc2_sub_map)
+ MCFG_CPU_IO_MAP(fromanc2_sub_io_map)
- MDRV_MACHINE_START(fromanc2)
- MDRV_MACHINE_RESET(fromanc2)
+ MCFG_MACHINE_START(fromanc2)
+ MCFG_MACHINE_RESET(fromanc2)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_GFXDECODE(fromanc2)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
-
- MDRV_VIDEO_START(fromanc2)
- MDRV_VIDEO_UPDATE(fromanc2)
+ MCFG_GFXDECODE(fromanc2)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+
+ MCFG_VIDEO_START(fromanc2)
+ MCFG_VIDEO_UPDATE(fromanc2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.75)
- MDRV_SOUND_ROUTE(2, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.75)
+ MCFG_SOUND_ROUTE(2, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fromancr, fromanc2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromancr_main_map)
- MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(fromancr_main_map)
+ MCFG_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map)
- MDRV_CPU_IO_MAP(fromanc2_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(fromanc2_sound_map)
+ MCFG_CPU_IO_MAP(fromanc2_sound_io_map)
- MDRV_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sub_map)
- MDRV_CPU_IO_MAP(fromanc2_sub_io_map)
+ MCFG_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(fromanc2_sub_map)
+ MCFG_CPU_IO_MAP(fromanc2_sub_io_map)
- MDRV_MACHINE_START(fromanc2)
- MDRV_MACHINE_RESET(fromanc2)
+ MCFG_MACHINE_START(fromanc2)
+ MCFG_MACHINE_RESET(fromanc2)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_GFXDECODE(fromancr)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
-
- MDRV_VIDEO_START(fromancr)
- MDRV_VIDEO_UPDATE(fromanc2)
+ MCFG_GFXDECODE(fromancr)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+
+ MCFG_VIDEO_START(fromancr)
+ MCFG_VIDEO_UPDATE(fromanc2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.75)
- MDRV_SOUND_ROUTE(2, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.75)
+ MCFG_SOUND_ROUTE(2, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fromanc4, fromanc2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc4_main_map)
- MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(fromanc4_main_map)
+ MCFG_CPU_VBLANK_INT("lscreen", fromanc2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(fromanc2_sound_map)
- MDRV_CPU_IO_MAP(fromanc2_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(fromanc2_sound_map)
+ MCFG_CPU_IO_MAP(fromanc2_sound_io_map)
- MDRV_MACHINE_START(fromanc4)
- MDRV_MACHINE_RESET(fromanc2)
+ MCFG_MACHINE_START(fromanc4)
+ MCFG_MACHINE_RESET(fromanc2)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_GFXDECODE(fromancr)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(fromancr)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(2048, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(2048, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
- MDRV_VIDEO_START(fromanc4)
- MDRV_VIDEO_UPDATE(fromanc2)
+ MCFG_VIDEO_START(fromanc4)
+ MCFG_VIDEO_UPDATE(fromanc2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.75)
- MDRV_SOUND_ROUTE(2, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.75)
+ MCFG_SOUND_ROUTE(2, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index fa0bfe4a781..5ed250467be 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -1011,117 +1011,117 @@ static MACHINE_RESET( fromance )
static MACHINE_CONFIG_START( nekkyoku, fromance_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(nekkyoku_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
+ MCFG_CPU_PROGRAM_MAP(nekkyoku_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(nekkyoku_sub_map)
- MDRV_CPU_IO_MAP(nekkyoku_sub_io_map)
+ MCFG_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
+ MCFG_CPU_PROGRAM_MAP(nekkyoku_sub_map)
+ MCFG_CPU_IO_MAP(nekkyoku_sub_io_map)
- MDRV_MACHINE_START(fromance)
- MDRV_MACHINE_RESET(fromance)
+ MCFG_MACHINE_START(fromance)
+ MCFG_MACHINE_RESET(fromance)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
- MDRV_GFXDECODE(fromance)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(fromance)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(nekkyoku)
- MDRV_VIDEO_UPDATE(fromance)
+ MCFG_VIDEO_START(nekkyoku)
+ MCFG_VIDEO_UPDATE(fromance)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12000000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("aysnd", AY8910, 12000000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( idolmj, fromance_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(fromance_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
+ MCFG_CPU_PROGRAM_MAP(fromance_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(fromance_sub_map)
- MDRV_CPU_IO_MAP(idolmj_sub_io_map)
+ MCFG_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
+ MCFG_CPU_PROGRAM_MAP(fromance_sub_map)
+ MCFG_CPU_IO_MAP(idolmj_sub_io_map)
- MDRV_MACHINE_START(fromance)
- MDRV_MACHINE_RESET(fromance)
+ MCFG_MACHINE_START(fromance)
+ MCFG_MACHINE_RESET(fromance)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
- MDRV_GFXDECODE(fromance)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(fromance)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(fromance)
- MDRV_VIDEO_UPDATE(fromance)
+ MCFG_VIDEO_START(fromance)
+ MCFG_VIDEO_UPDATE(fromance)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12000000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("aysnd", AY8910, 12000000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fromance, fromance_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(fromance_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
+ MCFG_CPU_PROGRAM_MAP(fromance_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
- MDRV_CPU_PROGRAM_MAP(fromance_sub_map)
- MDRV_CPU_IO_MAP(fromance_sub_io_map)
+ MCFG_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
+ MCFG_CPU_PROGRAM_MAP(fromance_sub_map)
+ MCFG_CPU_IO_MAP(fromance_sub_io_map)
- MDRV_MACHINE_START(fromance)
- MDRV_MACHINE_RESET(fromance)
+ MCFG_MACHINE_START(fromance)
+ MCFG_MACHINE_RESET(fromance)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1)
- MDRV_GFXDECODE(fromance)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(fromance)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(fromance)
- MDRV_VIDEO_UPDATE(fromance)
+ MCFG_VIDEO_START(fromance)
+ MCFG_VIDEO_UPDATE(fromance)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 4603dbbd896..598bb846ba5 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -295,35 +295,35 @@ static MACHINE_RESET( funkybee )
static MACHINE_CONFIG_START( funkybee, funkybee_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(funkybee_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(funkybee_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(funkybee)
- MDRV_MACHINE_RESET(funkybee)
+ MCFG_MACHINE_START(funkybee)
+ MCFG_MACHINE_RESET(funkybee)
/* 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(12, 32*8-8-1, 0*8, 28*8-1)
+ 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(12, 32*8-8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(funkybee)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(funkybee)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(funkybee)
- MDRV_VIDEO_START(funkybee)
- MDRV_VIDEO_UPDATE(funkybee)
+ MCFG_PALETTE_INIT(funkybee)
+ MCFG_VIDEO_START(funkybee)
+ MCFG_VIDEO_UPDATE(funkybee)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index c7db4d72877..be4115b6ebc 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -308,41 +308,41 @@ static MACHINE_START( funkyjet )
static MACHINE_CONFIG_START( funkyjet, funkyjet_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000) /* 28 MHz crystal */
- MDRV_CPU_PROGRAM_MAP(funkyjet_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 28 MHz crystal */
+ MCFG_CPU_PROGRAM_MAP(funkyjet_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(funkyjet)
+ MCFG_MACHINE_START(funkyjet)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(funkyjet)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(funkyjet)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_UPDATE(funkyjet)
+ MCFG_VIDEO_UPDATE(funkyjet)
- MDRV_DECO16IC_ADD("deco_custom", funkyjet_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", funkyjet_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 07c9b93e7ab..a3afbb19f42 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -2109,104 +2109,104 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( fw1stpal, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(funworld_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_CPU_PROGRAM_MAP(funworld_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", pia0_intf)
- MDRV_PIA6821_ADD("pia1", pia1_intf)
+ MCFG_PIA6821_ADD("pia0", pia0_intf)
+ MCFG_PIA6821_ADD("pia1", 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((124+1)*4, (30+1)*8) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */
- MDRV_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* Taken from MC6845 init, registers 01 & 06 */
+ 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) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */
+ MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* Taken from MC6845 init, registers 01 & 06 */
- MDRV_GFXDECODE(fw1stpal)
+ MCFG_GFXDECODE(fw1stpal)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(funworld)
- MDRV_VIDEO_START(funworld)
- MDRV_VIDEO_UPDATE(funworld)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_INIT(funworld)
+ MCFG_VIDEO_START(funworld)
+ MCFG_VIDEO_UPDATE(funworld)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/8, mc6845_intf) /* 2MHz, veryfied on jollycrd & royalcrd */
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/8, mc6845_intf) /* 2MHz, veryfied on jollycrd & royalcrd */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz */
- MDRV_SOUND_CONFIG(ay8910_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5) /* analyzed to avoid clips */
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_SOUND_CONFIG(ay8910_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5) /* analyzed to avoid clips */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fw2ndpal, fw1stpal )
- MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(funworld_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_CPU_PROGRAM_MAP(funworld_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_GFXDECODE(fw2ndpal)
+ MCFG_GFXDECODE(fw2ndpal)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( funquiz, fw1stpal )
-// MDRV_FRAGMENT_ADD(fw2ndpal)
+// MCFG_FRAGMENT_ADD(fw2ndpal)
- MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(funquiz_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_CPU_PROGRAM_MAP(funquiz_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_SOUND_REPLACE("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz */
- MDRV_SOUND_CONFIG(funquiz_ay8910_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
+ MCFG_SOUND_REPLACE("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_SOUND_CONFIG(funquiz_ay8910_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( magicrd2, fw1stpal )
- MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(magicrd2_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_CPU_PROGRAM_MAP(magicrd2_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_VIDEO_START(magicrd2)
+ MCFG_VIDEO_START(magicrd2)
- MDRV_SOUND_REPLACE("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz */
- MDRV_SOUND_CONFIG(ay8910_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.5) /* analyzed to avoid clips */
+ MCFG_SOUND_REPLACE("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_SOUND_CONFIG(ay8910_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.5) /* analyzed to avoid clips */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( royalcd1, fw1stpal )
- MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* (G65SC02P in pro version) 2MHz */
- MDRV_CPU_PROGRAM_MAP(magicrd2_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* (G65SC02P in pro version) 2MHz */
+ MCFG_CPU_PROGRAM_MAP(magicrd2_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( royalcd2, fw2ndpal )
- MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(magicrd2_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_CPU_PROGRAM_MAP(magicrd2_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cuoreuno, fw1stpal )
- MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(cuoreuno_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_CPU_PROGRAM_MAP(cuoreuno_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( saloon, fw1stpal )
- MDRV_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
- MDRV_CPU_PROGRAM_MAP(saloon_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz */
+ MCFG_CPU_PROGRAM_MAP(saloon_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index be16a193cfc..a5fe8bc6c42 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -220,36 +220,36 @@ static MACHINE_START( funybubl )
static MACHINE_CONFIG_START( funybubl, funybubl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz?? */
- MDRV_CPU_PROGRAM_MAP(funybubl_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(funybubl_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz?? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(funybubl)
+ MCFG_MACHINE_START(funybubl)
/* 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(12*8, 512-12*8-1, 16, 256-16-1)
-// MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0, 256-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(12*8, 512-12*8-1, 16, 256-16-1)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0, 256-1)
- MDRV_GFXDECODE(funybubl)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(funybubl)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(funybubl)
- MDRV_VIDEO_UPDATE(funybubl)
+ MCFG_VIDEO_START(funybubl)
+ MCFG_VIDEO_UPDATE(funybubl)
/* 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/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 2067cf6d042..fb3a78205f1 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -450,44 +450,44 @@ static MACHINE_RESET( fuuki16 )
static MACHINE_CONFIG_START( fuuki16, fuuki16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(fuuki16_map)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(fuuki16_map)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(fuuki16_sound_map)
- MDRV_CPU_IO_MAP(fuuki16_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(fuuki16_sound_map)
+ MCFG_CPU_IO_MAP(fuuki16_sound_io_map)
- MDRV_MACHINE_START(fuuki16)
- MDRV_MACHINE_RESET(fuuki16)
+ MCFG_MACHINE_START(fuuki16)
+ MCFG_MACHINE_RESET(fuuki16)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-16-1)
- MDRV_GFXDECODE(fuuki16)
- MDRV_PALETTE_LENGTH(0x800*4)
+ MCFG_GFXDECODE(fuuki16)
+ MCFG_PALETTE_LENGTH(0x800*4)
- MDRV_VIDEO_START(fuuki16)
- MDRV_VIDEO_UPDATE(fuuki16)
+ MCFG_VIDEO_START(fuuki16)
+ MCFG_VIDEO_UPDATE(fuuki16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.15)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.15)
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.15)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.15)
- MDRV_SOUND_ADD("ym2", YM3812, 4000000)
- MDRV_SOUND_CONFIG(fuuki16_ym3812_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("ym2", YM3812, 4000000)
+ MCFG_SOUND_CONFIG(fuuki16_ym3812_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index b504385b54b..cf6eaf28433 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -550,39 +550,39 @@ static const ymf278b_interface fuuki32_ymf278b_interface =
static MACHINE_CONFIG_START( fuuki32, fuuki32_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, CPU_CLOCK) /* 20MHz verified */
- MDRV_CPU_PROGRAM_MAP(fuuki32_map)
+ MCFG_CPU_ADD("maincpu", M68EC020, CPU_CLOCK) /* 20MHz verified */
+ MCFG_CPU_PROGRAM_MAP(fuuki32_map)
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CPU_CLOCK) /* 6MHz verified */
- MDRV_CPU_PROGRAM_MAP(fuuki32_sound_map)
- MDRV_CPU_IO_MAP(fuuki32_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CPU_CLOCK) /* 6MHz verified */
+ MCFG_CPU_PROGRAM_MAP(fuuki32_sound_map)
+ MCFG_CPU_IO_MAP(fuuki32_sound_io_map)
- MDRV_MACHINE_START(fuuki32)
- MDRV_MACHINE_RESET(fuuki32)
+ MCFG_MACHINE_START(fuuki32)
+ MCFG_MACHINE_RESET(fuuki32)
/* video hardware */
- //MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) // Buffered by 2 frames
+ //MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) // Buffered by 2 frames
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1)
- MDRV_GFXDECODE(fuuki32)
- MDRV_PALETTE_LENGTH(0x4000/2)
+ MCFG_GFXDECODE(fuuki32)
+ MCFG_PALETTE_LENGTH(0x4000/2)
- MDRV_VIDEO_START(fuuki32)
- MDRV_VIDEO_UPDATE(fuuki32)
- MDRV_VIDEO_EOF(fuuki32)
+ MCFG_VIDEO_START(fuuki32)
+ MCFG_VIDEO_UPDATE(fuuki32)
+ MCFG_VIDEO_EOF(fuuki32)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) /* YMF278B_STD_CLOCK = OSC 33.8688MHz */
- MDRV_SOUND_CONFIG(fuuki32_ymf278b_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) /* YMF278B_STD_CLOCK = OSC 33.8688MHz */
+ MCFG_SOUND_CONFIG(fuuki32_ymf278b_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 8e60975d001..cea706bde6e 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -500,133 +500,133 @@ static MACHINE_START( gaelco )
static MACHINE_CONFIG_START( bigkarnk, gaelco_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* MC68000P10, 10 MHz */
- MDRV_CPU_PROGRAM_MAP(bigkarnk_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* MC68000P10, 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(bigkarnk_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", M6809, 8867000/4) /* 68B09, 2.21675 MHz? */
- MDRV_CPU_PROGRAM_MAP(bigkarnk_snd_map)
+ MCFG_CPU_ADD("audiocpu", M6809, 8867000/4) /* 68B09, 2.21675 MHz? */
+ MCFG_CPU_PROGRAM_MAP(bigkarnk_snd_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(gaelco)
+ MCFG_MACHINE_START(gaelco)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(0x100000)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(0x100000)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(bigkarnk)
- MDRV_VIDEO_UPDATE(bigkarnk)
+ MCFG_VIDEO_START(bigkarnk)
+ MCFG_VIDEO_UPDATE(bigkarnk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3580000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3580000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- 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( maniacsq, gaelco_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(maniacsq_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(maniacsq_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(gaelco)
+ MCFG_MACHINE_START(gaelco)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(0x100000)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(0x100000)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(maniacsq)
- MDRV_VIDEO_UPDATE(maniacsq)
+ MCFG_VIDEO_START(maniacsq)
+ MCFG_VIDEO_UPDATE(maniacsq)
/* 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( squash, gaelco_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12, 12 MHz */
- MDRV_CPU_PROGRAM_MAP(squash_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12, 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(squash_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(gaelco)
+ MCFG_MACHINE_START(gaelco)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(0x100000)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(0x100000)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(maniacsq)
- MDRV_VIDEO_UPDATE(maniacsq)
+ MCFG_VIDEO_START(maniacsq)
+ MCFG_VIDEO_UPDATE(maniacsq)
/* 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( thoop, gaelco_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12, 12 MHz */
- MDRV_CPU_PROGRAM_MAP(thoop_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12, 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(thoop_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(gaelco)
+ MCFG_MACHINE_START(gaelco)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(0x100000)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(0x100000)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(maniacsq)
- MDRV_VIDEO_UPDATE(maniacsq)
+ MCFG_VIDEO_START(maniacsq)
+ MCFG_VIDEO_UPDATE(maniacsq)
/* 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/gaelco2.c b/src/mame/drivers/gaelco2.c
index 107a2368575..f1221ab43aa 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -157,34 +157,34 @@ static const gaelcosnd_interface maniacsq_snd_interface =
static MACHINE_CONFIG_START( maniacsq, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz? */
- MDRV_CPU_PROGRAM_MAP(maniacsq_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz? */
+ MCFG_CPU_PROGRAM_MAP(maniacsq_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(0x0080000)
- MDRV_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
+ MCFG_GFXDECODE(0x0080000)
+ MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
- MDRV_VIDEO_START(gaelco2)
- MDRV_VIDEO_EOF(gaelco2)
- MDRV_VIDEO_UPDATE(gaelco2)
+ MCFG_VIDEO_START(gaelco2)
+ MCFG_VIDEO_EOF(gaelco2)
+ MCFG_VIDEO_UPDATE(gaelco2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
- MDRV_SOUND_CONFIG(maniacsq_snd_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
+ MCFG_SOUND_CONFIG(maniacsq_snd_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -289,36 +289,36 @@ static const eeprom_interface gaelco2_eeprom_interface =
static MACHINE_CONFIG_START( bang, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 30000000/2) /* 15 MHz */
- MDRV_CPU_PROGRAM_MAP(bang_map)
- MDRV_CPU_VBLANK_INT_HACK(bang_interrupt, 6)
+ MCFG_CPU_ADD("maincpu", M68000, 30000000/2) /* 15 MHz */
+ MCFG_CPU_PROGRAM_MAP(bang_map)
+ MCFG_CPU_VBLANK_INT_HACK(bang_interrupt, 6)
- MDRV_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(0x0200000)
- MDRV_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
+ MCFG_GFXDECODE(0x0200000)
+ MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
- MDRV_VIDEO_START(gaelco2)
- MDRV_VIDEO_EOF(gaelco2)
- MDRV_VIDEO_UPDATE(gaelco2)
+ MCFG_VIDEO_START(gaelco2)
+ MCFG_VIDEO_EOF(gaelco2)
+ MCFG_VIDEO_UPDATE(gaelco2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("gaelco", GAELCO_CG1V, 0)
- MDRV_SOUND_CONFIG(bang_snd_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("gaelco", GAELCO_CG1V, 0)
+ MCFG_SOUND_CONFIG(bang_snd_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -533,34 +533,34 @@ static const gaelcosnd_interface alighunt_snd_interface =
static MACHINE_CONFIG_START( alighunt, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(alighunt_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(alighunt_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(0x0400000)
- MDRV_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
+ MCFG_GFXDECODE(0x0400000)
+ MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
- MDRV_VIDEO_START(gaelco2)
- MDRV_VIDEO_EOF(gaelco2)
- MDRV_VIDEO_UPDATE(gaelco2)
+ MCFG_VIDEO_START(gaelco2)
+ MCFG_VIDEO_EOF(gaelco2)
+ MCFG_VIDEO_UPDATE(gaelco2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
- MDRV_SOUND_CONFIG(alighunt_snd_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
+ MCFG_SOUND_CONFIG(alighunt_snd_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -776,42 +776,42 @@ static const gaelcosnd_interface touchgo_snd_interface =
static MACHINE_CONFIG_START( touchgo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(touchgo_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(touchgo_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq6_line_hold)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_GFXDECODE(0x0400000)
- MDRV_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(59.1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(64*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 480-1, 16, 256-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(59.1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(64*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 480-1, 16, 256-1)
-
- MDRV_VIDEO_START(gaelco2_dual)
- MDRV_VIDEO_EOF(gaelco2)
- MDRV_VIDEO_UPDATE(gaelco2_dual)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_GFXDECODE(0x0400000)
+ MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(59.1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(64*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 16, 256-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(59.1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(64*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 16, 256-1)
+
+ MCFG_VIDEO_START(gaelco2_dual)
+ MCFG_VIDEO_EOF(gaelco2)
+ MCFG_VIDEO_UPDATE(gaelco2_dual)
/* sound hardware */
/* the chip is stereo, but the game sound is mono because the right channel
output is for cabinet 1 and the left channel output is for cabinet 2 */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
- MDRV_SOUND_CONFIG(touchgo_snd_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
+ MCFG_SOUND_CONFIG(touchgo_snd_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/*
@@ -969,36 +969,36 @@ static const gaelcosnd_interface snowboar_snd_interface =
static MACHINE_CONFIG_START( snowboar, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 30000000/2) /* 15 MHz */
- MDRV_CPU_PROGRAM_MAP(snowboar_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 30000000/2) /* 15 MHz */
+ MCFG_CPU_PROGRAM_MAP(snowboar_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
- MDRV_GFXDECODE(0x0400000)
- MDRV_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
+ MCFG_GFXDECODE(0x0400000)
+ MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
- MDRV_VIDEO_START(gaelco2)
- MDRV_VIDEO_EOF(gaelco2)
- MDRV_VIDEO_UPDATE(gaelco2)
+ MCFG_VIDEO_START(gaelco2)
+ MCFG_VIDEO_EOF(gaelco2)
+ MCFG_VIDEO_UPDATE(gaelco2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("gaelco", GAELCO_CG1V, 0)
- MDRV_SOUND_CONFIG(snowboar_snd_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("gaelco", GAELCO_CG1V, 0)
+ MCFG_SOUND_CONFIG(snowboar_snd_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1211,45 +1211,45 @@ static const gaelcosnd_interface wrally2_snd_interface =
static MACHINE_CONFIG_START( wrally2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz */
- MDRV_CPU_PROGRAM_MAP(wrally2_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz */
+ MCFG_CPU_PROGRAM_MAP(wrally2_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq6_line_hold)
- MDRV_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", gaelco2_eeprom_interface)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_GFXDECODE(0x0200000)
- MDRV_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(59.1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(384, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(59.1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(384, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
-
-
- MDRV_VIDEO_START(gaelco2_dual)
- MDRV_VIDEO_EOF(gaelco2)
- MDRV_VIDEO_UPDATE(gaelco2_dual)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_GFXDECODE(0x0200000)
+ MCFG_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(59.1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(384, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(59.1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(384, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
+
+
+ MCFG_VIDEO_START(gaelco2_dual)
+ MCFG_VIDEO_EOF(gaelco2)
+ MCFG_VIDEO_UPDATE(gaelco2_dual)
/* sound hardware */
/* the chip is stereo, but the game sound is mono because the right channel
output is for cabinet 1 and the left channel output is for cabinet 2 */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
- MDRV_SOUND_CONFIG(wrally2_snd_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("gaelco", GAELCO_GAE1, 0)
+ MCFG_SOUND_CONFIG(wrally2_snd_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index a3a625c0c71..98f1c0af688 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -956,70 +956,70 @@ static const tms32031_config tms_config =
static MACHINE_CONFIG_START( gaelco3d, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 15000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_gen)
+ MCFG_CPU_ADD("maincpu", M68000, 15000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_gen)
- MDRV_CPU_ADD("tms", TMS32031, 60000000)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_map)
+ MCFG_CPU_ADD("tms", TMS32031, 60000000)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(tms_map)
- MDRV_CPU_ADD("adsp", ADSP2115, 16000000)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(adsp_program_map)
- MDRV_CPU_DATA_MAP(adsp_data_map)
+ MCFG_CPU_ADD("adsp", ADSP2115, 16000000)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(adsp_program_map)
+ MCFG_CPU_DATA_MAP(adsp_data_map)
- MDRV_MACHINE_START(gaelco3d)
- MDRV_MACHINE_RESET(gaelco3d)
+ MCFG_MACHINE_START(gaelco3d)
+ MCFG_MACHINE_RESET(gaelco3d)
- MDRV_EEPROM_93C66B_ADD("eeprom")
+ MCFG_EEPROM_93C66B_ADD("eeprom")
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_TIMER_ADD("adsp_timer", adsp_autobuffer_irq)
+ MCFG_TIMER_ADD("adsp_timer", adsp_autobuffer_irq)
/* 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(576, 432)
- MDRV_SCREEN_VISIBLE_AREA(0, 575, 0, 431)
+ 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(576, 432)
+ MCFG_SCREEN_VISIBLE_AREA(0, 575, 0, 431)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_VIDEO_START(gaelco3d)
- MDRV_VIDEO_UPDATE(gaelco3d)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_VIDEO_START(gaelco3d)
+ MCFG_VIDEO_UPDATE(gaelco3d)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: front mono */
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: front mono */
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: left rear */
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: left rear */
- MDRV_SOUND_ADD("dac3", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: right rear */
+ MCFG_SOUND_ADD("dac3", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: right rear */
- MDRV_SOUND_ADD("dac4", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: seat speaker */
+ MCFG_SOUND_ADD("dac4", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: seat speaker */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gaelco3d2, gaelco3d )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", M68EC020, 25000000)
- MDRV_CPU_PROGRAM_MAP(main020_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_gen)
+ MCFG_CPU_REPLACE("maincpu", M68EC020, 25000000)
+ MCFG_CPU_PROGRAM_MAP(main020_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_gen)
- MDRV_CPU_MODIFY("tms")
- MDRV_CPU_CLOCK(50000000)
+ MCFG_CPU_MODIFY("tms")
+ MCFG_CPU_CLOCK(50000000)
- MDRV_MACHINE_RESET(gaelco3d2)
+ MCFG_MACHINE_RESET(gaelco3d2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 4762e44236a..a88625746b7 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -767,97 +767,97 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( shadoww, gaiden_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 18432000/2) /* 9.216 MHz */
- MDRV_CPU_PROGRAM_MAP(gaiden_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 18432000/2) /* 9.216 MHz */
+ MCFG_CPU_PROGRAM_MAP(gaiden_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* IRQs are triggered by the YM2203 */
- MDRV_MACHINE_START(raiga)
- MDRV_MACHINE_RESET(raiga)
+ MCFG_MACHINE_START(raiga)
+ MCFG_MACHINE_RESET(raiga)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.17) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.17) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
- MDRV_GFXDECODE(gaiden)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(gaiden)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(gaiden)
- MDRV_VIDEO_UPDATE(gaiden)
+ MCFG_VIDEO_START(gaiden)
+ MCFG_VIDEO_UPDATE(gaiden)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.60)
-
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- 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.60)
-
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.60)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.60)
+
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( raiga, shadoww )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_VIDEO_START(raiga)
- MDRV_VIDEO_UPDATE(raiga)
- MDRV_GFXDECODE(raiga)
+ MCFG_VIDEO_START(raiga)
+ MCFG_VIDEO_UPDATE(raiga)
+ MCFG_GFXDECODE(raiga)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( drgnbowl, gaiden_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 20000000/2) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(drgnbowl_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 20000000/2) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(drgnbowl_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(drgnbowl_sound_map)
- MDRV_CPU_IO_MAP(drgnbowl_sound_port_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 12000000/2) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(drgnbowl_sound_map)
+ MCFG_CPU_IO_MAP(drgnbowl_sound_port_map)
- MDRV_MACHINE_START(raiga)
- MDRV_MACHINE_RESET(raiga)
+ MCFG_MACHINE_START(raiga)
+ MCFG_MACHINE_RESET(raiga)
/* 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)
+ 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)
- MDRV_GFXDECODE(drgnbowl)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(drgnbowl)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(drgnbowl)
- MDRV_VIDEO_UPDATE(drgnbowl)
+ MCFG_VIDEO_START(drgnbowl)
+ MCFG_VIDEO_UPDATE(drgnbowl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/*
@@ -942,50 +942,50 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_START( mastninj, gaiden_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz? */
- MDRV_CPU_PROGRAM_MAP(mastninj_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz? */
+ MCFG_CPU_PROGRAM_MAP(mastninj_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ?? MHz */
- MDRV_CPU_PROGRAM_MAP(mastninj_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ?? MHz */
+ MCFG_CPU_PROGRAM_MAP(mastninj_sound_map)
/* IRQs are triggered by the YM2203 */
- MDRV_MACHINE_START(raiga)
- MDRV_MACHINE_RESET(raiga)
+ MCFG_MACHINE_START(raiga)
+ MCFG_MACHINE_RESET(raiga)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.17) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- 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_REFRESH_RATE(59.17) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mastninj)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(mastninj)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(mastninj)
- MDRV_VIDEO_UPDATE(gaiden)
+ MCFG_VIDEO_START(mastninj)
+ MCFG_VIDEO_UPDATE(gaiden)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 4000000) /* ?? MHz */
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.60)
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000) /* ?? MHz */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MDRV_SOUND_ADD("ym2", YM2203, 4000000) /* ?? MHz */
- 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.60)
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000) /* ?? MHz */
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.60)
/* no OKI on the bootleg */
-// MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+// MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c
index 7361eb5b1e4..6c4d9b32e8a 100644
--- a/src/mame/drivers/gal3.c
+++ b/src/mame/drivers/gal3.c
@@ -631,65 +631,65 @@ static const c140_interface C140_interface_typeB =
};
static MACHINE_CONFIG_START( gal3, driver_device )
- MDRV_CPU_ADD("cpumst", M68020, 49152000/2)
- MDRV_CPU_PROGRAM_MAP(cpu_mst_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq1_line_hold)
+ MCFG_CPU_ADD("cpumst", M68020, 49152000/2)
+ MCFG_CPU_PROGRAM_MAP(cpu_mst_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq1_line_hold)
- MDRV_CPU_ADD("cpuslv", M68020, 49152000/2)
- MDRV_CPU_PROGRAM_MAP(cpu_slv_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq1_line_hold)
+ MCFG_CPU_ADD("cpuslv", M68020, 49152000/2)
+ MCFG_CPU_PROGRAM_MAP(cpu_slv_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq1_line_hold)
- MDRV_CPU_ADD("rs_cpu", M68000, 49152000/4)
- MDRV_CPU_PROGRAM_MAP(rs_cpu_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq5_line_hold) /// programmable via 148 IC
+ MCFG_CPU_ADD("rs_cpu", M68000, 49152000/4)
+ MCFG_CPU_PROGRAM_MAP(rs_cpu_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq5_line_hold) /// programmable via 148 IC
- MDRV_CPU_ADD("sound_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(sound_cpu_map)
+ MCFG_CPU_ADD("sound_cpu", M68000, 12000000) // ??
+ MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
- MDRV_CPU_ADD("psn_b1_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map)
+ MCFG_CPU_ADD("psn_b1_cpu", M68000, 12000000) // ??
+ MCFG_CPU_PROGRAM_MAP(psn_b1_cpu_map)
/*
- MDRV_CPU_ADD("psn_b2_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
+ MCFG_CPU_ADD("psn_b2_cpu", M68000, 12000000) // ??
+ MCFG_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
- MDRV_CPU_ADD("psn_b3_cpu", M68000, 12000000) // ??
- MDRV_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
+ MCFG_CPU_ADD("psn_b3_cpu", M68000, 12000000) // ??
+ MCFG_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
*/
- MDRV_QUANTUM_TIME(HZ(60*8000)) /* 8000 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(60*8000)) /* 8000 CPU slices per frame */
- MDRV_NVRAM_HANDLER(gal3)
+ MCFG_NVRAM_HANDLER(gal3)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1)
- MDRV_GFXDECODE(namcos21)
- MDRV_PALETTE_LENGTH(NAMCOS21_NUM_COLORS)
+ MCFG_GFXDECODE(namcos21)
+ MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS)
- MDRV_VIDEO_START(gal3)
- MDRV_VIDEO_UPDATE(gal3)
+ MCFG_VIDEO_START(gal3)
+ MCFG_VIDEO_UPDATE(gal3)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140_16g", C140, 8000000/374)
- MDRV_SOUND_CONFIG(C140_interface_typeA) //to be verified
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("c140_16g", C140, 8000000/374)
+ MCFG_SOUND_CONFIG(C140_interface_typeA) //to be verified
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("c140_16a", C140, 8000000/374)
- MDRV_SOUND_CONFIG(C140_interface_typeA)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("c140_16a", C140, 8000000/374)
+ MCFG_SOUND_CONFIG(C140_interface_typeA)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 654c2bb9ed8..38379ff2cc2 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1584,262 +1584,262 @@ static const samples_interface battles_samples_interface =
static MACHINE_CONFIG_START( bosco, _galaga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(bosco_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(bosco_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(bosco_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(bosco_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(bosco_map)
+ MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(bosco_map)
- MDRV_NAMCO_50XX_ADD("50xx_1", MASTER_CLOCK/6/2) /* 1.536 MHz */
- MDRV_NAMCO_50XX_ADD("50xx_2", MASTER_CLOCK/6/2) /* 1.536 MHz */
- MDRV_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2, namco_51xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_52XX_ADD("52xx", MASTER_CLOCK/6/2, namco_52xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2, "discrete", NODE_01) /* 1.536 MHz */
+ MCFG_NAMCO_50XX_ADD("50xx_1", MASTER_CLOCK/6/2) /* 1.536 MHz */
+ MCFG_NAMCO_50XX_ADD("50xx_2", MASTER_CLOCK/6/2) /* 1.536 MHz */
+ MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2, namco_51xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_52XX_ADD("52xx", MASTER_CLOCK/6/2, namco_52xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2, "discrete", NODE_01) /* 1.536 MHz */
- MDRV_NAMCO_06XX_ADD("06xx_0", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, "50xx_1", "54xx")
- MDRV_NAMCO_06XX_ADD("06xx_1", MASTER_CLOCK/6/64, "sub", "50xx_2", "52xx", NULL, NULL)
+ MCFG_NAMCO_06XX_ADD("06xx_0", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, "50xx_1", "54xx")
+ MCFG_NAMCO_06XX_ADD("06xx_1", MASTER_CLOCK/6/64, "sub", "50xx_2", "52xx", NULL, NULL)
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(galaga)
- MDRV_MACHINE_RESET(galaga)
+ MCFG_MACHINE_START(galaga)
+ MCFG_MACHINE_RESET(galaga)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 16, 224+16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 16, 224+16)
- MDRV_GFXDECODE(bosco)
- MDRV_PALETTE_LENGTH(64*4+64*4+4+64)
+ MCFG_GFXDECODE(bosco)
+ MCFG_PALETTE_LENGTH(64*4+64*4+4+64)
- MDRV_PALETTE_INIT(bosco)
- MDRV_VIDEO_START(bosco)
- MDRV_VIDEO_UPDATE(bosco)
- MDRV_VIDEO_EOF(bosco)
+ MCFG_PALETTE_INIT(bosco)
+ MCFG_VIDEO_START(bosco)
+ MCFG_VIDEO_UPDATE(bosco)
+ MCFG_VIDEO_EOF(bosco)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(bosco)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(bosco)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( galaga, _galaga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaga_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(galaga_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaga_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(galaga_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaga_map)
+ MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(galaga_map)
- MDRV_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2, namco_51xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2, "discrete", NODE_01) /* 1.536 MHz */
+ MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2, namco_51xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2, "discrete", NODE_01) /* 1.536 MHz */
- MDRV_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, NULL, "54xx")
+ MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, NULL, "54xx")
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(galaga)
- MDRV_MACHINE_RESET(galaga)
+ MCFG_MACHINE_START(galaga)
+ MCFG_MACHINE_RESET(galaga)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
- MDRV_GFXDECODE(galaga)
- MDRV_PALETTE_LENGTH(64*4+64*4+64)
+ MCFG_GFXDECODE(galaga)
+ MCFG_PALETTE_LENGTH(64*4+64*4+64)
- MDRV_PALETTE_INIT(galaga)
- MDRV_VIDEO_START(galaga)
- MDRV_VIDEO_UPDATE(galaga)
- MDRV_VIDEO_EOF(galaga)
+ MCFG_PALETTE_INIT(galaga)
+ MCFG_VIDEO_START(galaga)
+ MCFG_VIDEO_UPDATE(galaga)
+ MCFG_VIDEO_EOF(galaga)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(galaga)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(galaga)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( galagab, galaga )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("54xx")
- MDRV_DEVICE_REMOVE("06xx")
+ MCFG_DEVICE_REMOVE("54xx")
+ MCFG_DEVICE_REMOVE("06xx")
/* FIXME: bootlegs should not have any Namco custom chip. However, this workaround is needed atm */
- MDRV_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, NULL, NULL)
+ MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, NULL, NULL)
- MDRV_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaga_mem4)
+ MCFG_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(galaga_mem4)
/* sound hardware */
- MDRV_DEVICE_REMOVE("discrete")
+ MCFG_DEVICE_REMOVE("discrete")
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( xevious, _galaga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(xevious_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(xevious_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", Z80,MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(xevious_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", Z80,MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(xevious_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(xevious_map)
+ MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(xevious_map)
- MDRV_NAMCO_50XX_ADD("50xx", MASTER_CLOCK/6/2) /* 1.536 MHz */
- MDRV_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2, namco_51xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2, "discrete", NODE_01) /* 1.536 MHz */
+ MCFG_NAMCO_50XX_ADD("50xx", MASTER_CLOCK/6/2) /* 1.536 MHz */
+ MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2, namco_51xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2, "discrete", NODE_01) /* 1.536 MHz */
- MDRV_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, "50xx", "54xx")
+ MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, "50xx", "54xx")
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_QUANTUM_TIME(HZ(60000)) /* 1000 CPU slices per frame - an high value to ensure proper */
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_QUANTUM_TIME(HZ(60000)) /* 1000 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(galaga)
- MDRV_MACHINE_RESET(galaga)
+ MCFG_MACHINE_START(galaga)
+ MCFG_MACHINE_RESET(galaga)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
- MDRV_GFXDECODE(xevious)
- MDRV_PALETTE_LENGTH(128*4+64*8+64*2)
+ MCFG_GFXDECODE(xevious)
+ MCFG_PALETTE_LENGTH(128*4+64*8+64*2)
- MDRV_PALETTE_INIT(xevious)
- MDRV_VIDEO_START(xevious)
- MDRV_VIDEO_UPDATE(xevious)
+ MCFG_PALETTE_INIT(xevious)
+ MCFG_VIDEO_START(xevious)
+ MCFG_VIDEO_UPDATE(xevious)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(galaga)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(galaga)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( battles, xevious )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("50xx")
- MDRV_DEVICE_REMOVE("54xx")
- MDRV_DEVICE_REMOVE("06xx")
+ MCFG_DEVICE_REMOVE("50xx")
+ MCFG_DEVICE_REMOVE("54xx")
+ MCFG_DEVICE_REMOVE("06xx")
/* FIXME: bootlegs should not have any Namco custom chip. However, this workaround is needed atm */
- MDRV_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, NULL, NULL)
+ MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", NULL, NULL, NULL)
- MDRV_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(battles_mem4)
- MDRV_CPU_VBLANK_INT("screen", battles_interrupt_4)
+ MCFG_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(battles_mem4)
+ MCFG_CPU_VBLANK_INT("screen", battles_interrupt_4)
- MDRV_TIMER_ADD("battles_nmi", battles_nmi_generate)
+ MCFG_TIMER_ADD("battles_nmi", battles_nmi_generate)
- MDRV_MACHINE_RESET(battles)
+ MCFG_MACHINE_RESET(battles)
/* video hardware */
- MDRV_PALETTE_INIT(battles)
+ MCFG_PALETTE_INIT(battles)
/* sound hardware */
- MDRV_DEVICE_REMOVE("discrete")
+ MCFG_DEVICE_REMOVE("discrete")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(battles_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(battles_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( digdug, _galaga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(digdug_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(digdug_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(digdug_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(digdug_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(digdug_map)
+ MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(digdug_map)
- MDRV_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2, namco_51xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_53XX_ADD("53xx", MASTER_CLOCK/6/2, namco_53xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/6/2, namco_51xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_53XX_ADD("53xx", MASTER_CLOCK/6/2, namco_53xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", "53xx", NULL, NULL)
+ MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64, "maincpu", "51xx", "53xx", NULL, NULL)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(galaga)
- MDRV_MACHINE_RESET(galaga)
+ MCFG_MACHINE_START(galaga)
+ MCFG_MACHINE_RESET(galaga)
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
- MDRV_GFXDECODE(digdug)
- MDRV_PALETTE_LENGTH(16*2+64*4+64*4)
+ MCFG_GFXDECODE(digdug)
+ MCFG_PALETTE_LENGTH(16*2+64*4+64*4)
- MDRV_PALETTE_INIT(digdug)
- MDRV_VIDEO_START(digdug)
- MDRV_VIDEO_UPDATE(digdug)
+ MCFG_PALETTE_INIT(digdug)
+ MCFG_VIDEO_START(digdug)
+ MCFG_VIDEO_UPDATE(digdug)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dzigzag, digdug )
/* basic machine hardware */
- MDRV_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(dzigzag_mem4)
+ MCFG_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(dzigzag_mem4)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index ca6a2c3ac8c..c65e297d607 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -314,31 +314,31 @@ static const tc0480scp_interface galastrm_tc0480scp_intf =
static MACHINE_CONFIG_START( galastrm, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(galastrm_map)
- MDRV_CPU_VBLANK_INT("screen", galastrm_interrupt) /* VBL */
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(galastrm_map)
+ MCFG_CPU_VBLANK_INT("screen", galastrm_interrupt) /* VBL */
- MDRV_EEPROM_ADD("eeprom", galastrm_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", galastrm_eeprom_interface)
/* 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, 50*8)
- MDRV_SCREEN_VISIBLE_AREA(0+96, 40*8-1+96, 3*8+60, 32*8-1+60)
+ 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, 50*8)
+ MCFG_SCREEN_VISIBLE_AREA(0+96, 40*8-1+96, 3*8+60, 32*8-1+60)
- MDRV_GFXDECODE(galastrm)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(galastrm)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(galastrm)
- MDRV_VIDEO_UPDATE(galastrm)
+ MCFG_VIDEO_START(galastrm)
+ MCFG_VIDEO_UPDATE(galastrm)
- MDRV_TC0100SCN_ADD("tc0100scn", galastrm_tc0100scn_intf)
- MDRV_TC0480SCP_ADD("tc0480scp", galastrm_tc0480scp_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", galastrm_tc0100scn_intf)
+ MCFG_TC0480SCP_ADD("tc0480scp", galastrm_tc0480scp_intf)
/* sound hardware */
- MDRV_FRAGMENT_ADD(taito_f3_sound)
+ MCFG_FRAGMENT_ADD(taito_f3_sound)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index af3718184e0..aeedca4df3f 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -394,33 +394,33 @@ static MACHINE_RESET( galaxi )
static MACHINE_CONFIG_START( galaxi, galaxi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) // ?
- MDRV_CPU_PROGRAM_MAP(galaxi_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) // ?
+ MCFG_CPU_PROGRAM_MAP(galaxi_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(galaxi)
- MDRV_MACHINE_RESET(galaxi)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(galaxi)
+ MCFG_MACHINE_RESET(galaxi)
+ 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(16*5, 512-16*2-1, 16*1, 256-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(16*5, 512-16*2-1, 16*1, 256-1)
- MDRV_GFXDECODE(galaxi)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(galaxi)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(galaxi)
- MDRV_VIDEO_UPDATE(galaxi)
+ MCFG_VIDEO_START(galaxi)
+ MCFG_VIDEO_UPDATE(galaxi)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_LOW) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_LOW) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -429,10 +429,10 @@ static MACHINE_CONFIG_DERIVED( magjoker, galaxi )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_MODIFY("oki")
+ MCFG_SOUND_MODIFY("oki")
/* ADPCM samples are recorded with extremely low volume */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 4.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 4.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c
index 173a7cbfbb8..57ecaaf0dd4 100644
--- a/src/mame/drivers/galaxia.c
+++ b/src/mame/drivers/galaxia.c
@@ -258,45 +258,45 @@ static const s2636_interface s2636_2_config =
static MACHINE_CONFIG_START( galaxia, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650,2000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(mem_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", galaxia_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650,2000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", galaxia_interrupt)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
- MDRV_GFXDECODE(galaxia)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(galaxia)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_S2636_ADD("s2636_0", s2636_0_config)
- MDRV_S2636_ADD("s2636_1", s2636_1_config)
- MDRV_S2636_ADD("s2636_2", s2636_2_config)
+ MCFG_S2636_ADD("s2636_0", s2636_0_config)
+ MCFG_S2636_ADD("s2636_1", s2636_1_config)
+ MCFG_S2636_ADD("s2636_2", s2636_2_config)
- MDRV_VIDEO_UPDATE(galaxia)
+ MCFG_VIDEO_UPDATE(galaxia)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("s2636snd_0", S2636_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("s2636snd_0", S2636_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("s2636snd_1", S2636_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("s2636snd_1", S2636_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("s2636snd_2", S2636_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("s2636snd_2", S2636_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( astrowar, galaxia )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astrowar_mem)
- MDRV_CPU_IO_MAP(astrowar_io)
- MDRV_GFXDECODE(astrowar)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(astrowar_mem)
+ MCFG_CPU_IO_MAP(astrowar_io)
+ MCFG_GFXDECODE(astrowar)
MACHINE_CONFIG_END
ROM_START( galaxia )
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 53b7b04bcd6..5c0c74b2dac 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -1959,83 +1959,83 @@ DISCRETE_SOUND_END
static MACHINE_CONFIG_START( galaxian_base, galaxian_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(galaxian_map)
- MDRV_CPU_VBLANK_INT("screen", interrupt_gen)
+ MCFG_CPU_ADD("maincpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2)
+ MCFG_CPU_PROGRAM_MAP(galaxian_map)
+ MCFG_CPU_VBLANK_INT("screen", interrupt_gen)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
/* video hardware */
- MDRV_GFXDECODE(galaxian)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(galaxian)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(GALAXIAN_PIXEL_CLOCK, GALAXIAN_HTOTAL, GALAXIAN_HBEND, GALAXIAN_HBSTART, GALAXIAN_VTOTAL, GALAXIAN_VBEND, GALAXIAN_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(GALAXIAN_PIXEL_CLOCK, GALAXIAN_HTOTAL, GALAXIAN_HBEND, GALAXIAN_HBSTART, GALAXIAN_VTOTAL, GALAXIAN_VBEND, GALAXIAN_VBSTART)
- MDRV_PALETTE_INIT(galaxian)
- MDRV_VIDEO_START(galaxian)
- MDRV_VIDEO_UPDATE(galaxian)
+ MCFG_PALETTE_INIT(galaxian)
+ MCFG_VIDEO_START(galaxian)
+ MCFG_VIDEO_UPDATE(galaxian)
/* blinking frequency is determined by 555 counter with Ra=100k, Rb=10k, C=10uF */
- MDRV_TIMER_ADD_PERIODIC("stars", galaxian_stars_blink_timer, NSEC(PERIOD_OF_555_ASTABLE_NSEC(100000, 10000, 0.00001)))
+ MCFG_TIMER_ADD_PERIODIC("stars", galaxian_stars_blink_timer, NSEC(PERIOD_OF_555_ASTABLE_NSEC(100000, 10000, 0.00001)))
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( konami_base, galaxian_base )
- MDRV_PPI8255_ADD( "ppi8255_0", konami_ppi8255_0_intf )
- MDRV_PPI8255_ADD( "ppi8255_1", konami_ppi8255_1_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", konami_ppi8255_0_intf )
+ MCFG_PPI8255_ADD( "ppi8255_1", konami_ppi8255_1_intf )
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( konami_sound_1x_ay8910 )
/* 2nd CPU to drive sound */
- MDRV_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(frogger_sound_map)
- MDRV_CPU_IO_MAP(frogger_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(frogger_sound_map)
+ MCFG_CPU_IO_MAP(frogger_sound_portmap)
/* sound hardware */
- MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(frogger_ay8910_interface)
- MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 0)
- MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 1)
- MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 2)
-
- MDRV_SOUND_ADD("konami", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(konami_sound)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(frogger_ay8910_interface)
+ MCFG_SOUND_ROUTE_EX(0, "konami", 1.0, 0)
+ MCFG_SOUND_ROUTE_EX(1, "konami", 1.0, 1)
+ MCFG_SOUND_ROUTE_EX(2, "konami", 1.0, 2)
+
+ MCFG_SOUND_ADD("konami", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(konami_sound)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( konami_sound_2x_ay8910 )
/* 2nd CPU to drive sound */
- MDRV_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(konami_sound_map)
- MDRV_CPU_IO_MAP(konami_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(konami_sound_map)
+ MCFG_CPU_IO_MAP(konami_sound_portmap)
/* sound hardware */
- MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(konami_ay8910_interface_1)
- MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 0)
- MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 1)
- MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 2)
-
- MDRV_SOUND_ADD("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(konami_ay8910_interface_2)
- MDRV_SOUND_ROUTE_EX(0, "konami", 1.0, 3)
- MDRV_SOUND_ROUTE_EX(1, "konami", 1.0, 4)
- MDRV_SOUND_ROUTE_EX(2, "konami", 1.0, 5)
-
- MDRV_SOUND_ADD("konami", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(konami_sound)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(konami_ay8910_interface_1)
+ MCFG_SOUND_ROUTE_EX(0, "konami", 1.0, 0)
+ MCFG_SOUND_ROUTE_EX(1, "konami", 1.0, 1)
+ MCFG_SOUND_ROUTE_EX(2, "konami", 1.0, 2)
+
+ MCFG_SOUND_ADD("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(konami_ay8910_interface_2)
+ MCFG_SOUND_ROUTE_EX(0, "konami", 1.0, 3)
+ MCFG_SOUND_ROUTE_EX(1, "konami", 1.0, 4)
+ MCFG_SOUND_ROUTE_EX(2, "konami", 1.0, 5)
+
+ MCFG_SOUND_ADD("konami", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(konami_sound)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -2047,300 +2047,300 @@ MACHINE_CONFIG_END
*************************************/
static MACHINE_CONFIG_DERIVED( galaxian, galaxian_base )
- MDRV_FRAGMENT_ADD(galaxian_audio)
+ MCFG_FRAGMENT_ADD(galaxian_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pacmanbl, galaxian )
/* separate tile/sprite ROMs */
- MDRV_GFXDECODE(pacmanbl)
+ MCFG_GFXDECODE(pacmanbl)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tenspot, galaxian )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", fakechange_interrupt_gen)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", fakechange_interrupt_gen)
/* basic machine hardware */
- MDRV_CPU_ADD("selectcpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2) // ?? mhz
- MDRV_CPU_PROGRAM_MAP(tenspot_select_map)
- //MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("selectcpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2) // ?? mhz
+ MCFG_CPU_PROGRAM_MAP(tenspot_select_map)
+ //MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* separate tile/sprite ROMs */
- MDRV_GFXDECODE(tenspot)
+ MCFG_GFXDECODE(tenspot)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( zigzag, galaxian_base )
/* separate tile/sprite ROMs */
- MDRV_GFXDECODE(pacmanbl)
+ MCFG_GFXDECODE(pacmanbl)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(galaxian_map_base) /* no discrete sound */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(galaxian_map_base) /* no discrete sound */
/* sound hardware */
- MDRV_SOUND_ADD("aysnd", AY8910, 1789750)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1789750)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gmgalax, galaxian )
/* banked video hardware */
- MDRV_GFXDECODE(gmgalax)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(gmgalax)
+ MCFG_PALETTE_LENGTH(64)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mooncrst, galaxian_base )
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mooncrst_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mooncrst_map)
- MDRV_FRAGMENT_ADD(mooncrst_audio)
+ MCFG_FRAGMENT_ADD(mooncrst_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jumpbug, galaxian_base )
- MDRV_WATCHDOG_VBLANK_INIT(0)
+ MCFG_WATCHDOG_VBLANK_INIT(0)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jumpbug_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(jumpbug_map)
/* sound hardware */
- MDRV_SOUND_ADD("aysnd", AY8910, 1789750)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1789750)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( checkman, mooncrst )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", Z80, 1620000) /* 1.62 MHz */
- MDRV_CPU_PROGRAM_MAP(checkman_sound_map)
- MDRV_CPU_IO_MAP(checkman_sound_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMIs are triggered by the main CPU */
+ MCFG_CPU_ADD("audiocpu", Z80, 1620000) /* 1.62 MHz */
+ MCFG_CPU_PROGRAM_MAP(checkman_sound_map)
+ MCFG_CPU_IO_MAP(checkman_sound_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMIs are triggered by the main CPU */
/* sound hardware */
- MDRV_SOUND_ADD("aysnd", AY8910, 1789750)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1789750)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( checkmaj, galaxian_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(galaxian_map_base) /* no discrete sound */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(galaxian_map_base) /* no discrete sound */
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", Z80, 1620000)
- MDRV_CPU_PROGRAM_MAP(checkmaj_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 1620000)
+ MCFG_CPU_PROGRAM_MAP(checkmaj_sound_map)
- MDRV_TIMER_ADD_SCANLINE("irq0", checkmaj_irq0_gen, "screen", 0, 8)
+ MCFG_TIMER_ADD_SCANLINE("irq0", checkmaj_irq0_gen, "screen", 0, 8)
/* sound hardware */
- MDRV_SOUND_ADD("aysnd", AY8910, 1620000)
- MDRV_SOUND_CONFIG(checkmaj_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1620000)
+ MCFG_SOUND_CONFIG(checkmaj_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mshuttle, galaxian_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mshuttle_map)
- MDRV_CPU_IO_MAP(mshuttle_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mshuttle_map)
+ MCFG_CPU_IO_MAP(mshuttle_portmap)
/* sound hardware */
- MDRV_SOUND_ADD("aysnd", AY8910, GALAXIAN_PIXEL_CLOCK/3/4)
- MDRV_SOUND_CONFIG(cclimber_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, GALAXIAN_PIXEL_CLOCK/3/4)
+ MCFG_SOUND_CONFIG(cclimber_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(cclimber_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(cclimber_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kingball, mooncrst )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", Z80,5000000/2)
- MDRV_CPU_PROGRAM_MAP(kingball_sound_map)
- MDRV_CPU_IO_MAP(kingball_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80,5000000/2)
+ MCFG_CPU_PROGRAM_MAP(kingball_sound_map)
+ MCFG_CPU_IO_MAP(kingball_sound_portmap)
/* sound hardware */
- 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
static MACHINE_CONFIG_DERIVED( frogger, konami_base )
- MDRV_FRAGMENT_ADD(konami_sound_1x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_1x_ay8910)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(frogger_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(frogger_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( froggrmc, galaxian_base )
- MDRV_FRAGMENT_ADD(konami_sound_1x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_1x_ay8910)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mooncrst_map_base) /* no discrete sound ! */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mooncrst_map_base) /* no discrete sound ! */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( froggers, konami_base )
- MDRV_FRAGMENT_ADD(konami_sound_1x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_1x_ay8910)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(theend_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(theend_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( frogf, konami_base )
- MDRV_FRAGMENT_ADD(konami_sound_1x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_1x_ay8910)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(frogf_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(frogf_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( turtles, konami_base )
- MDRV_FRAGMENT_ADD(konami_sound_2x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(turtles_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(turtles_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( theend, galaxian_base )
- MDRV_FRAGMENT_ADD(konami_sound_2x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(theend_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(theend_map)
- MDRV_PPI8255_ADD( "ppi8255_0", theend_ppi8255_0_intf )
- MDRV_PPI8255_ADD( "ppi8255_1", konami_ppi8255_1_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", theend_ppi8255_0_intf )
+ MCFG_PPI8255_ADD( "ppi8255_1", konami_ppi8255_1_intf )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( scramble, galaxian_base )
- MDRV_FRAGMENT_ADD(konami_sound_2x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(theend_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(theend_map)
- MDRV_PPI8255_ADD( "ppi8255_0", konami_ppi8255_0_intf )
- MDRV_PPI8255_ADD( "ppi8255_1", scramble_ppi8255_1_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", konami_ppi8255_0_intf )
+ MCFG_PPI8255_ADD( "ppi8255_1", scramble_ppi8255_1_intf )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( explorer, konami_base )
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(theend_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(theend_map)
/* 2nd CPU to drive sound */
- MDRV_CPU_ADD("audiocpu", Z80,KONAMI_SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(konami_sound_map)
- MDRV_CPU_IO_MAP(konami_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80,KONAMI_SOUND_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(konami_sound_map)
+ MCFG_CPU_IO_MAP(konami_sound_portmap)
/* sound hardware */
- MDRV_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(explorer_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(explorer_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(explorer_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(explorer_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( scorpion, theend )
- MDRV_PPI8255_RECONFIG( "ppi8255_0", konami_ppi8255_0_intf )
- MDRV_PPI8255_RECONFIG( "ppi8255_1", scorpion_ppi8255_1_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255_0", konami_ppi8255_0_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255_1", scorpion_ppi8255_1_intf )
/* extra AY8910 with I/O ports */
- MDRV_SOUND_ADD("8910.2", AY8910, KONAMI_SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(scorpion_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("8910.2", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(scorpion_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("digitalker", DIGITALKER, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
+ MCFG_SOUND_ADD("digitalker", DIGITALKER, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sfx, galaxian_base )
- MDRV_FRAGMENT_ADD(konami_sound_2x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910)
- MDRV_WATCHDOG_VBLANK_INIT(0)
+ MCFG_WATCHDOG_VBLANK_INIT(0)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sfx_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sfx_map)
/* 3rd CPU for the sample player */
- MDRV_CPU_ADD("audio2", Z80, KONAMI_SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sfx_sample_map)
- MDRV_CPU_IO_MAP(sfx_sample_portmap)
+ MCFG_CPU_ADD("audio2", Z80, KONAMI_SOUND_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(sfx_sample_map)
+ MCFG_CPU_IO_MAP(sfx_sample_portmap)
- MDRV_PPI8255_ADD( "ppi8255_0", konami_ppi8255_0_intf )
- MDRV_PPI8255_ADD( "ppi8255_1", konami_ppi8255_1_intf )
- MDRV_PPI8255_ADD( "ppi8255_2", sfx_ppi8255_2_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", konami_ppi8255_0_intf )
+ MCFG_PPI8255_ADD( "ppi8255_1", konami_ppi8255_1_intf )
+ MCFG_PPI8255_ADD( "ppi8255_2", sfx_ppi8255_2_intf )
/* port on 1st 8910 is used for communication */
- MDRV_SOUND_MODIFY("8910.0")
- MDRV_SOUND_CONFIG(sfx_ay8910_interface)
+ MCFG_SOUND_MODIFY("8910.0")
+ MCFG_SOUND_CONFIG(sfx_ay8910_interface)
/* DAC for the sample player */
- 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
static MACHINE_CONFIG_DERIVED( scobra, konami_base )
- MDRV_FRAGMENT_ADD(konami_sound_2x_ay8910)
+ MCFG_FRAGMENT_ADD(konami_sound_2x_ay8910)
/* alternate memory map */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scobra_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(scobra_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( anteater, scobra )
/* quiet down the sounds */
- MDRV_SOUND_MODIFY("konami")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
+ MCFG_SOUND_MODIFY("konami")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( moonwar, scobra )
/* same as regular type 1, the only difference is that the bullets are less yellow */
/* device config overrides */
- MDRV_PPI8255_RECONFIG( "ppi8255_0", moonwar_ppi8255_0_intf )
- MDRV_PPI8255_RECONFIG( "ppi8255_1", konami_ppi8255_1_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255_0", moonwar_ppi8255_0_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255_1", konami_ppi8255_1_intf )
- MDRV_PALETTE_INIT(moonwar)
+ MCFG_PALETTE_INIT(moonwar)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 944ae35fb8f..a6f9d67bb89 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -2121,30 +2121,30 @@ static const ay8910_interface bongo_ay8910_interface =
static MACHINE_CONFIG_START( galaxold_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(galaxold_map)
+ MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(galaxold_map)
- MDRV_MACHINE_RESET(galaxold)
+ MCFG_MACHINE_RESET(galaxold)
- MDRV_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
- MDRV_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
+ MCFG_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
+ MCFG_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
- MDRV_TIMER_ADD("int_timer", galaxold_interrupt_timer)
+ MCFG_TIMER_ADD("int_timer", galaxold_interrupt_timer)
/* video hardware */
- MDRV_GFXDECODE(galaxian)
- MDRV_PALETTE_LENGTH(32+2+64) /* 32 for the characters, 2 for the bullets, 64 for the stars */
+ MCFG_GFXDECODE(galaxian)
+ MCFG_PALETTE_LENGTH(32+2+64) /* 32 for the characters, 2 for the bullets, 64 for the stars */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(galaxold)
- MDRV_VIDEO_START(galaxold)
- MDRV_VIDEO_UPDATE(galaxold)
+ MCFG_PALETTE_INIT(galaxold)
+ MCFG_VIDEO_START(galaxold)
+ MCFG_VIDEO_UPDATE(galaxold)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
@@ -2153,7 +2153,7 @@ static MACHINE_CONFIG_DERIVED( galaxian, galaxold_base )
/* basic machine hardware */
/* sound hardware */
- MDRV_FRAGMENT_ADD(galaxian_audio)
+ MCFG_FRAGMENT_ADD(galaxian_audio)
MACHINE_CONFIG_END
@@ -2162,45 +2162,45 @@ static MACHINE_CONFIG_DERIVED( batman2, galaxian )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_START(batman2)
+ MCFG_VIDEO_START(batman2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mooncrst, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mooncrst_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mooncrst_map)
/* video hardware */
- MDRV_VIDEO_START(mooncrst)
+ MCFG_VIDEO_START(mooncrst)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( scramblb, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scramblb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(scramblb_map)
/* video hardware */
- MDRV_PALETTE_LENGTH(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */
+ MCFG_PALETTE_LENGTH(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */
- MDRV_PALETTE_INIT(scrambold)
- MDRV_VIDEO_START(scrambold)
+ MCFG_PALETTE_INIT(scrambold)
+ MCFG_VIDEO_START(scrambold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( scramb2, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scramb2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(scramb2_map)
/* video hardware */
- MDRV_PALETTE_LENGTH(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */
+ MCFG_PALETTE_LENGTH(32+2+64+1) /* 32 for the characters, 2 for the bullets, 64 for the stars, 1 for background */
- MDRV_PALETTE_INIT(scrambold)
- MDRV_VIDEO_START(scrambold)
+ MCFG_PALETTE_INIT(scrambold)
+ MCFG_VIDEO_START(scrambold)
MACHINE_CONFIG_END
@@ -2208,220 +2208,220 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( 4in1, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(_4in1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(_4in1_map)
/* video hardware */
- MDRV_GFXDECODE(_4in1)
+ MCFG_GFXDECODE(_4in1)
- MDRV_VIDEO_START(pisces)
+ MCFG_VIDEO_START(pisces)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bagmanmc, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bagmanmc_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bagmanmc_map)
- MDRV_MACHINE_RESET( devilfsg )
+ MCFG_MACHINE_RESET( devilfsg )
/* video hardware */
- MDRV_GFXDECODE(bagmanmc)
+ MCFG_GFXDECODE(bagmanmc)
- MDRV_VIDEO_START(pisces)
+ MCFG_VIDEO_START(pisces)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dkongjrm, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dkongjrm_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dkongjrm_map)
/* video hardware */
- MDRV_VIDEO_START(dkongjrm)
+ MCFG_VIDEO_START(dkongjrm)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rockclim, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rockclim_map)
- MDRV_GFXDECODE(rockclim)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rockclim_map)
+ MCFG_GFXDECODE(rockclim)
/* video hardware */
- MDRV_VIDEO_START(rockclim)
- MDRV_PALETTE_LENGTH(64+64+2) /* 64 colors only, but still uses bullets so we need to keep the palette big */
- MDRV_PALETTE_INIT(rockclim)
+ MCFG_VIDEO_START(rockclim)
+ MCFG_PALETTE_LENGTH(64+64+2) /* 64 colors only, but still uses bullets so we need to keep the palette big */
+ MCFG_PALETTE_INIT(rockclim)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(64*8, 32*8)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ozon1, galaxold_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ozon1_map)
- MDRV_CPU_IO_MAP(ozon1_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ozon1_map)
+ MCFG_CPU_IO_MAP(ozon1_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_RESET(0)
+ MCFG_MACHINE_RESET(0)
- MDRV_PALETTE_INIT(rockclim)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_PALETTE_INIT(rockclim)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_VIDEO_START(galaxold_plain)
- MDRV_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_VIDEO_START(galaxold_plain)
+ MCFG_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( drivfrcg, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(drivfrcg)
- MDRV_CPU_IO_MAP(drivfrcg_io)
- MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/6)
+ MCFG_CPU_PROGRAM_MAP(drivfrcg)
+ MCFG_CPU_IO_MAP(drivfrcg_io)
+ MCFG_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(16000.0/132/2)
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(16000.0/132/2)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(64)
- MDRV_GFXDECODE(gmgalax)
+ MCFG_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(gmgalax)
- MDRV_PALETTE_INIT(rockclim)
+ MCFG_PALETTE_INIT(rockclim)
- MDRV_VIDEO_START(drivfrcg)
- MDRV_VIDEO_UPDATE(galaxold)
+ MCFG_VIDEO_START(drivfrcg)
+ MCFG_VIDEO_UPDATE(galaxold)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(galaxian_audio)
+ MCFG_FRAGMENT_ADD(galaxian_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bongo, galaxold_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bongo)
- MDRV_CPU_IO_MAP(bongo_io)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bongo)
+ MCFG_CPU_IO_MAP(bongo_io)
- MDRV_VIDEO_START(bongo)
- MDRV_VIDEO_UPDATE(galaxold)
+ MCFG_VIDEO_START(bongo)
+ MCFG_VIDEO_UPDATE(galaxold)
- MDRV_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4)
- MDRV_SOUND_CONFIG(bongo_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4)
+ MCFG_SOUND_CONFIG(bongo_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hunchbkg, galaxold_base )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", S2650, PIXEL_CLOCK / 4)
+ MCFG_CPU_REPLACE("maincpu", S2650, PIXEL_CLOCK / 4)
- MDRV_CPU_PROGRAM_MAP(hunchbkg)
- MDRV_CPU_IO_MAP(hunchbkg_io)
+ MCFG_CPU_PROGRAM_MAP(hunchbkg)
+ MCFG_CPU_IO_MAP(hunchbkg_io)
- MDRV_MACHINE_RESET(hunchbkg)
+ MCFG_MACHINE_RESET(hunchbkg)
- MDRV_FRAGMENT_ADD(galaxian_audio)
+ MCFG_FRAGMENT_ADD(galaxian_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( harem, galaxold_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(harem_cpu1)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(harem_cpu1)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80, 1620000) //?
- MDRV_CPU_PROGRAM_MAP(harem_cpu2)
- MDRV_CPU_IO_MAP(harem_cpu2_io)
+ MCFG_CPU_ADD("audiocpu", Z80, 1620000) //?
+ MCFG_CPU_PROGRAM_MAP(harem_cpu2)
+ MCFG_CPU_IO_MAP(harem_cpu2_io)
- MDRV_MACHINE_RESET(0)
+ MCFG_MACHINE_RESET(0)
- MDRV_PALETTE_INIT(rockclim)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_PALETTE_INIT(rockclim)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_VIDEO_START(galaxold_plain)
+ MCFG_VIDEO_START(galaxold_plain)
- MDRV_SOUND_ADD("ay1", AY8910, 2000000) //?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
+ MCFG_SOUND_ADD("ay1", AY8910, 2000000) //?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
- MDRV_SOUND_ADD("ay2", AY8910, 2000000) //?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000) //?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
- MDRV_SOUND_ADD("ay3", AY8910, 2000000) //?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
+ MCFG_SOUND_ADD("ay3", AY8910, 2000000) //?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33/3)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tazzmang, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tazzmang)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tazzmang)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( racknrol, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(racknrol)
- MDRV_CPU_IO_MAP(racknrol_io)
- MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(racknrol)
+ MCFG_CPU_IO_MAP(racknrol_io)
+ MCFG_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
- MDRV_GFXDECODE(galaxian)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(galaxian)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(rockclim)
- MDRV_VIDEO_UPDATE(galaxold)
- MDRV_VIDEO_START(racknrol)
+ MCFG_PALETTE_INIT(rockclim)
+ MCFG_VIDEO_UPDATE(galaxold)
+ MCFG_VIDEO_START(racknrol)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, PIXEL_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("sn1", SN76496, PIXEL_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76496, PIXEL_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76496, PIXEL_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn3", SN76496, PIXEL_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn3", SN76496, PIXEL_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ckongg, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ckongg_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ckongg_map)
- MDRV_GFXDECODE(gmgalax)
+ MCFG_GFXDECODE(gmgalax)
- MDRV_VIDEO_START(ckongs)
+ MCFG_VIDEO_START(ckongs)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ckongmc, galaxian )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ckongmc_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ckongmc_map)
- MDRV_GFXDECODE(gmgalax)
+ MCFG_GFXDECODE(gmgalax)
- MDRV_VIDEO_START(ckongs)
+ MCFG_VIDEO_START(ckongs)
MACHINE_CONFIG_END
@@ -2429,26 +2429,26 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hexpoola, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(racknrol)
- MDRV_CPU_IO_MAP(hexpoola_io)
- MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(racknrol)
+ MCFG_CPU_IO_MAP(hexpoola_io)
+ MCFG_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
- MDRV_GFXDECODE(galaxian)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(galaxian)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(rockclim)
- MDRV_VIDEO_UPDATE(galaxold)
- MDRV_VIDEO_START(racknrol)
+ MCFG_PALETTE_INIT(rockclim)
+ MCFG_VIDEO_UPDATE(galaxold)
+ MCFG_VIDEO_START(racknrol)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76496, PIXEL_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("snsnd", SN76496, PIXEL_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 7098f61498b..1f3c17c9cfe 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -456,88 +456,88 @@ static MACHINE_RESET( ninjemak )
static MACHINE_CONFIG_START( galivan, galivan_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(galivan_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
+ MCFG_CPU_PROGRAM_MAP(galivan_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 7250) /* timed interrupt, ?? Hz */
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 7250) /* timed interrupt, ?? Hz */
- MDRV_MACHINE_START(galivan)
- MDRV_MACHINE_RESET(galivan)
+ MCFG_MACHINE_START(galivan)
+ MCFG_MACHINE_RESET(galivan)
/* 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)
+ 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)
- MDRV_GFXDECODE(galivan)
- MDRV_PALETTE_LENGTH(8*16+16*16+256*16)
+ MCFG_GFXDECODE(galivan)
+ MCFG_PALETTE_LENGTH(8*16+16*16+256*16)
- MDRV_PALETTE_INIT(galivan)
- MDRV_VIDEO_START(galivan)
- MDRV_VIDEO_UPDATE(galivan)
+ MCFG_PALETTE_INIT(galivan)
+ MCFG_VIDEO_START(galivan)
+ MCFG_VIDEO_UPDATE(galivan)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, 8000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, 8000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ninjemak, galivan_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(ninjemak_map)
- MDRV_CPU_IO_MAP(ninjemak_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz? */
+ MCFG_CPU_PROGRAM_MAP(ninjemak_map)
+ MCFG_CPU_IO_MAP(ninjemak_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 7250) /* timed interrupt, ?? Hz */
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 7250) /* timed interrupt, ?? Hz */
- MDRV_MACHINE_START(ninjemak)
- MDRV_MACHINE_RESET(ninjemak)
+ MCFG_MACHINE_START(ninjemak)
+ MCFG_MACHINE_RESET(ninjemak)
/* 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(1*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(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(ninjemak)
- MDRV_PALETTE_LENGTH(8*16+16*16+256*16)
+ MCFG_GFXDECODE(ninjemak)
+ MCFG_PALETTE_LENGTH(8*16+16*16+256*16)
- MDRV_PALETTE_INIT(galivan)
- MDRV_VIDEO_START(ninjemak)
- MDRV_VIDEO_UPDATE(ninjemak)
+ MCFG_PALETTE_INIT(galivan)
+ MCFG_VIDEO_START(ninjemak)
+ MCFG_VIDEO_UPDATE(ninjemak)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, 8000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM3526, 8000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index aeda63c948d..4a6c9a55d43 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -577,41 +577,41 @@ static INTERRUPT_GEN( galpani2_interrupt2 )
static MACHINE_CONFIG_START( galpani2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_27MHz/2) /* Confirmed on galpani2i PCB */
- MDRV_CPU_PROGRAM_MAP(galpani2_mem1)
- MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt1,GALPANI2_INTERRUPTS_NUM)
- //MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_27MHz/2) /* Confirmed on galpani2i PCB */
+ MCFG_CPU_PROGRAM_MAP(galpani2_mem1)
+ MCFG_CPU_VBLANK_INT_HACK(galpani2_interrupt1,GALPANI2_INTERRUPTS_NUM)
+ //MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_CPU_ADD("sub", M68000, XTAL_27MHz/2) /* Confirmed on galpani2i PCB */
- MDRV_CPU_PROGRAM_MAP(galpani2_mem2)
- MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt2,GALPANI2_INTERRUPTS_NUM2)
+ MCFG_CPU_ADD("sub", M68000, XTAL_27MHz/2) /* Confirmed on galpani2i PCB */
+ MCFG_CPU_PROGRAM_MAP(galpani2_mem2)
+ MCFG_CPU_VBLANK_INT_HACK(galpani2_interrupt2,GALPANI2_INTERRUPTS_NUM2)
- MDRV_MACHINE_RESET(galpani2)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_RESET(galpani2)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1-16)
+ 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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1-16)
- MDRV_GFXDECODE(galpani2)
- MDRV_PALETTE_LENGTH(0x4000 + 0x200 + 0x8000) // sprites, bg8, bg15
+ MCFG_GFXDECODE(galpani2)
+ MCFG_PALETTE_LENGTH(0x4000 + 0x200 + 0x8000) // sprites, bg8, bg15
- MDRV_PALETTE_INIT(galpani2)
- MDRV_VIDEO_START(galpani2)
- MDRV_VIDEO_UPDATE(galpani2)
+ MCFG_PALETTE_INIT(galpani2)
+ MCFG_VIDEO_START(galpani2)
+ MCFG_VIDEO_UPDATE(galpani2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", XTAL_20MHz/10, OKIM6295_PIN7_HIGH) /* Confirmed on galpani2i PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", XTAL_20MHz/10, OKIM6295_PIN7_HIGH) /* Confirmed on galpani2i PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", XTAL_20MHz/10, OKIM6295_PIN7_HIGH) /* Confirmed on galpani2i PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki2", XTAL_20MHz/10, OKIM6295_PIN7_HIGH) /* Confirmed on galpani2i PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index 192b179df2b..ed2fefaf17d 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -899,31 +899,31 @@ static const ymz280b_interface ymz280b_intf =
};
static MACHINE_CONFIG_START( galpani3, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 16000000) // ? (from which clock?)
- MDRV_CPU_PROGRAM_MAP(galpani3_map)
- MDRV_CPU_VBLANK_INT_HACK(galpani3_vblank, 3)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) // ? (from which clock?)
+ MCFG_CPU_PROGRAM_MAP(galpani3_map)
+ MCFG_CPU_VBLANK_INT_HACK(galpani3_vblank, 3)
- 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(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- //MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 64*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_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ //MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 64*8-1)
- MDRV_PALETTE_LENGTH(0x4303)
+ MCFG_PALETTE_LENGTH(0x4303)
- MDRV_VIDEO_START(galpani3)
- MDRV_VIDEO_UPDATE(galpani3)
+ MCFG_VIDEO_START(galpani3)
+ MCFG_VIDEO_UPDATE(galpani3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymz", YMZ280B, 28636400 / 2)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 28636400 / 2)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index e4a30b19cde..a83a5b87b75 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -874,33 +874,33 @@ static const kaneko_pandora_interface galpanic_pandora_config =
static MACHINE_CONFIG_START( galpanic, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(galpanic_map)
- MDRV_CPU_VBLANK_INT_HACK(galpanic_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(galpanic_map)
+ MCFG_CPU_VBLANK_INT_HACK(galpanic_interrupt,2)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
- MDRV_GFXDECODE(galpanic)
- MDRV_PALETTE_LENGTH(1024 + 32768)
+ MCFG_GFXDECODE(galpanic)
+ MCFG_PALETTE_LENGTH(1024 + 32768)
- MDRV_KANEKO_PANDORA_ADD("pandora", galpanic_pandora_config)
+ MCFG_KANEKO_PANDORA_ADD("pandora", galpanic_pandora_config)
- MDRV_PALETTE_INIT(galpanic)
- MDRV_VIDEO_START(galpanic)
- MDRV_VIDEO_UPDATE(galpanic)
- MDRV_VIDEO_EOF( galpanic )
+ MCFG_PALETTE_INIT(galpanic)
+ MCFG_VIDEO_START(galpanic)
+ MCFG_VIDEO_UPDATE(galpanic)
+ MCFG_VIDEO_EOF( galpanic )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -909,84 +909,84 @@ static MACHINE_CONFIG_DERIVED( galpanica, galpanic )
/* basic machine hardware */
/* arm watchdog */
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( comad, galpanic )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(10000000)
- MDRV_CPU_PROGRAM_MAP(comad_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(10000000)
+ MCFG_CPU_PROGRAM_MAP(comad_map)
- MDRV_DEVICE_REMOVE("pandora")
+ MCFG_DEVICE_REMOVE("pandora")
/* video hardware */
- MDRV_VIDEO_UPDATE(comad)
- MDRV_VIDEO_EOF(0)
+ MCFG_VIDEO_UPDATE(comad)
+ MCFG_VIDEO_EOF(0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( supmodel, comad )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(supmodel_map)
- MDRV_CPU_VBLANK_INT_HACK(galpanic_interrupt,2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(12000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(supmodel_map)
+ MCFG_CPU_VBLANK_INT_HACK(galpanic_interrupt,2)
/* video hardware */
- MDRV_VIDEO_UPDATE(comad)
- MDRV_VIDEO_EOF(0)
+ MCFG_VIDEO_UPDATE(comad)
+ MCFG_VIDEO_EOF(0)
/* sound hardware */
- MDRV_OKIM6295_REPLACE("oki", 1584000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_REPLACE("oki", 1584000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fantsia2, comad )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(fantsia2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(12000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(fantsia2_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(comad)
- MDRV_VIDEO_EOF(0)
+ MCFG_VIDEO_UPDATE(comad)
+ MCFG_VIDEO_EOF(0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( galhustl, comad )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(galhustl_map)
- MDRV_CPU_VBLANK_INT_HACK(galhustl_interrupt,3)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(12000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(galhustl_map)
+ MCFG_CPU_VBLANK_INT_HACK(galhustl_interrupt,3)
/* video hardware */
- MDRV_VIDEO_UPDATE(comad)
- MDRV_VIDEO_EOF(0)
+ MCFG_VIDEO_UPDATE(comad)
+ MCFG_VIDEO_EOF(0)
/* sound hardware */
- MDRV_OKIM6295_REPLACE("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_REPLACE("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_DERIVED( zipzap, comad )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(zipzap_map)
- MDRV_CPU_VBLANK_INT_HACK(galhustl_interrupt,3)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(12000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(zipzap_map)
+ MCFG_CPU_VBLANK_INT_HACK(galhustl_interrupt,3)
/* video hardware */
- MDRV_VIDEO_UPDATE(comad)
+ MCFG_VIDEO_UPDATE(comad)
/* sound hardware */
- MDRV_OKIM6295_REPLACE("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_REPLACE("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/galspnbl.c b/src/mame/drivers/galspnbl.c
index 4bff700d89b..1a8b009bee2 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -210,39 +210,39 @@ static MACHINE_START( galspnbl )
static MACHINE_CONFIG_START( galspnbl, galspnbl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)/* also has vector for 6, but it does nothing */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)/* also has vector for 6, but it does nothing */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
/* NMI is caused by the main CPU */
- MDRV_MACHINE_START(galspnbl)
+ MCFG_MACHINE_START(galspnbl)
/* 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, 16, 240-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, 16, 240-1)
- MDRV_GFXDECODE(galspnbl)
- MDRV_PALETTE_LENGTH(1024 + 32768)
+ MCFG_GFXDECODE(galspnbl)
+ MCFG_PALETTE_LENGTH(1024 + 32768)
- MDRV_PALETTE_INIT(galspnbl)
- MDRV_VIDEO_UPDATE(galspnbl)
+ MCFG_PALETTE_INIT(galspnbl)
+ MCFG_VIDEO_UPDATE(galspnbl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, 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/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index e2c87c6cdf1..6c2db21c690 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -659,44 +659,44 @@ static const struct pit8253_config gamecstl_pit8254_config =
static MACHINE_CONFIG_START( gamecstl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PENTIUM, 200000000)
- MDRV_CPU_PROGRAM_MAP(gamecstl_map)
- MDRV_CPU_IO_MAP(gamecstl_io)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 200000000)
+ MCFG_CPU_PROGRAM_MAP(gamecstl_map)
+ MCFG_CPU_IO_MAP(gamecstl_io)
- MDRV_MACHINE_START(gamecstl)
- MDRV_MACHINE_RESET(gamecstl)
+ MCFG_MACHINE_START(gamecstl)
+ MCFG_MACHINE_RESET(gamecstl)
- MDRV_PCI_BUS_ADD("pcibus", 0)
- MDRV_PCI_BUS_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w)
- MDRV_PCI_BUS_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
+ MCFG_PCI_BUS_ADD("pcibus", 0)
+ MCFG_PCI_BUS_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w)
+ MCFG_PCI_BUS_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
- MDRV_PIT8254_ADD( "pit8254", gamecstl_pit8254_config )
+ MCFG_PIT8254_ADD( "pit8254", gamecstl_pit8254_config )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
+ MCFG_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
- MDRV_PIC8259_ADD( "pic8259_1", gamecstl_pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_1", gamecstl_pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", gamecstl_pic8259_2_config )
+ MCFG_PIC8259_ADD( "pic8259_2", gamecstl_pic8259_2_config )
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
/* 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
-
- MDRV_GFXDECODE(CGA)
- MDRV_PALETTE_LENGTH(16)
-
- MDRV_VIDEO_START(gamecstl)
- MDRV_VIDEO_UPDATE(gamecstl)
+ 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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
+
+ MCFG_GFXDECODE(CGA)
+ MCFG_PALETTE_LENGTH(16)
+
+ MCFG_VIDEO_START(gamecstl)
+ MCFG_VIDEO_UPDATE(gamecstl)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index a1d7dbb265a..729ef3194ad 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -1010,48 +1010,48 @@ static MACHINE_RESET( gameplan )
static MACHINE_CONFIG_START( gameplan, gameplan_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(gameplan_main_map)
+ MCFG_CPU_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(gameplan_main_map)
- MDRV_CPU_ADD("audiocpu", M6502, GAMEPLAN_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(gameplan_audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, GAMEPLAN_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(gameplan_audio_map)
- MDRV_RIOT6532_ADD("riot", GAMEPLAN_AUDIO_CPU_CLOCK, r6532_interface)
+ MCFG_RIOT6532_ADD("riot", GAMEPLAN_AUDIO_CPU_CLOCK, r6532_interface)
- MDRV_MACHINE_START(gameplan)
- MDRV_MACHINE_RESET(gameplan)
+ MCFG_MACHINE_START(gameplan)
+ MCFG_MACHINE_RESET(gameplan)
/* video hardware */
- MDRV_FRAGMENT_ADD(gameplan_video)
+ MCFG_FRAGMENT_ADD(gameplan_video)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, GAMEPLAN_AY8910_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("aysnd", AY8910, GAMEPLAN_AY8910_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
/* via */
- MDRV_VIA6522_ADD("via6522_0", 0, gameplan_via_0_interface)
- MDRV_VIA6522_ADD("via6522_1", 0, via_1_interface)
- MDRV_VIA6522_ADD("via6522_2", 0, via_2_interface)
+ MCFG_VIA6522_ADD("via6522_0", 0, gameplan_via_0_interface)
+ MCFG_VIA6522_ADD("via6522_1", 0, via_1_interface)
+ MCFG_VIA6522_ADD("via6522_2", 0, via_2_interface)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( leprechn, gameplan )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(LEPRECHAUN_MAIN_CPU_CLOCK)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(LEPRECHAUN_MAIN_CPU_CLOCK)
/* basic machine hardware */
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(leprechn_audio_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(leprechn_audio_map)
/* video hardware */
- MDRV_FRAGMENT_ADD(leprechn_video)
+ MCFG_FRAGMENT_ADD(leprechn_video)
/* via */
- MDRV_DEVICE_REMOVE("via6522_0")
- MDRV_VIA6522_ADD("via6522_0", 0, leprechn_via_0_interface)
+ MCFG_DEVICE_REMOVE("via6522_0")
+ MCFG_VIA6522_ADD("via6522_0", 0, leprechn_via_0_interface)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 3274775ea2f..7c2b4a04495 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -525,72 +525,72 @@ static const namcoio_interface intf1 =
static MACHINE_CONFIG_START( gaplus, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 24576000/16) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", gaplus_interrupt_1)
+ MCFG_CPU_ADD("maincpu", M6809, 24576000/16) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", gaplus_interrupt_1)
- MDRV_CPU_ADD("sub", M6809, 24576000/16) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", M6809, 24576000/16) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub2", M6809, 24576000/16) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu3_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub2", M6809, 24576000/16) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(cpu3_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_QUANTUM_TIME(HZ(6000)) /* a high value to ensure proper synchronization of the CPUs */
- MDRV_MACHINE_RESET(gaplus)
+ MCFG_QUANTUM_TIME(HZ(6000)) /* a high value to ensure proper synchronization of the CPUs */
+ MCFG_MACHINE_RESET(gaplus)
- MDRV_NAMCO56XX_ADD("56xx", intf0_lamps)
- MDRV_NAMCO58XX_ADD("58xx", intf1)
+ MCFG_NAMCO56XX_ADD("56xx", intf0_lamps)
+ MCFG_NAMCO58XX_ADD("58xx", intf1)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(gaplus)
- MDRV_PALETTE_LENGTH(64*4+64*8)
+ MCFG_GFXDECODE(gaplus)
+ MCFG_PALETTE_LENGTH(64*4+64*8)
- MDRV_PALETTE_INIT(gaplus)
- MDRV_VIDEO_START(gaplus)
- MDRV_VIDEO_UPDATE(gaplus)
- MDRV_VIDEO_EOF(gaplus)
+ MCFG_PALETTE_INIT(gaplus)
+ MCFG_VIDEO_START(gaplus)
+ MCFG_VIDEO_UPDATE(gaplus)
+ MCFG_VIDEO_EOF(gaplus)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO_15XX, 24576000/1024)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO_15XX, 24576000/1024)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gaplus_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gaplus_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gaplusa, gaplus )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gaplusa_cpu1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gaplusa_cpu1_map)
- MDRV_DEVICE_REMOVE("56xx")
- MDRV_DEVICE_REMOVE("58xx")
- MDRV_NAMCO56XX_ADD("56xx", intf1)
- MDRV_NAMCO58XX_ADD("58xx", intf0)
+ MCFG_DEVICE_REMOVE("56xx")
+ MCFG_DEVICE_REMOVE("58xx")
+ MCFG_NAMCO56XX_ADD("56xx", intf1)
+ MCFG_NAMCO58XX_ADD("58xx", intf0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gapluso, gaplus )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("56xx")
- MDRV_DEVICE_REMOVE("58xx")
- MDRV_NAMCO58XX_ADD("56xx", intf0)
- MDRV_NAMCO56XX_ADD("58xx", intf1)
+ MCFG_DEVICE_REMOVE("56xx")
+ MCFG_DEVICE_REMOVE("58xx")
+ MCFG_NAMCO58XX_ADD("56xx", intf0)
+ MCFG_NAMCO56XX_ADD("58xx", intf1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index 9280d69ca4d..12150c1fd45 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -435,33 +435,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( gat, gatron_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/24) /* 666.66 kHz, guess */
- MDRV_CPU_PROGRAM_MAP(gat_map)
- MDRV_CPU_IO_MAP(gat_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/24) /* 666.66 kHz, guess */
+ MCFG_CPU_PROGRAM_MAP(gat_map)
+ MCFG_CPU_IO_MAP(gat_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_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(48*8, 16*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 16*16-1)
-
- MDRV_GFXDECODE(gat)
- MDRV_PALETTE_INIT(gat)
- MDRV_PALETTE_LENGTH(8)
- MDRV_VIDEO_START(gat)
- MDRV_VIDEO_UPDATE(gat)
+ 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(48*8, 16*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 16*16-1)
+
+ MCFG_GFXDECODE(gat)
+ MCFG_PALETTE_INIT(gat)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_VIDEO_START(gat)
+ MCFG_VIDEO_UPDATE(gat)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8 ) /* 2 MHz, guess */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8 ) /* 2 MHz, guess */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 75e3f36350a..6a38d250e23 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -516,45 +516,45 @@ GFXDECODE_END
static MACHINE_CONFIG_START( gauntlet, gauntlet_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(gauntlet)
- MDRV_MACHINE_RESET(gauntlet)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(gauntlet)
+ MCFG_MACHINE_RESET(gauntlet)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(gauntlet)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(gauntlet)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a SYNGEN chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(gauntlet)
- MDRV_VIDEO_UPDATE(gauntlet)
+ MCFG_VIDEO_START(gauntlet)
+ MCFG_VIDEO_UPDATE(gauntlet)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.48)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.48)
+ MCFG_SOUND_ADD("ymsnd", YM2151, ATARI_CLOCK_14MHz/4)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.48)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.48)
- MDRV_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.32)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.32)
+ MCFG_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.32)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.32)
- MDRV_SOUND_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11) /* potentially ATARI_CLOCK_14MHz/2/9 as well */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11) /* potentially ATARI_CLOCK_14MHz/2/9 as well */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index b1889d7e30b..6a5bc3b8c10 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -390,63 +390,63 @@ static MACHINE_RESET( gberet )
static MACHINE_CONFIG_START( gberet, gberet_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) // X1S (generated by a custom IC)
- MDRV_CPU_PROGRAM_MAP(gberet_map)
- MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 32) // 1 IRQ + 16 NMI (generated by a custom IC)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) // X1S (generated by a custom IC)
+ MCFG_CPU_PROGRAM_MAP(gberet_map)
+ MCFG_CPU_VBLANK_INT_HACK(gberet_interrupt, 32) // 1 IRQ + 16 NMI (generated by a custom IC)
- MDRV_MACHINE_START(gberet)
- MDRV_MACHINE_RESET(gberet)
+ MCFG_MACHINE_START(gberet)
+ MCFG_MACHINE_RESET(gberet)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- 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(1*8, 31*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ 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(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(gberet)
- MDRV_PALETTE_LENGTH(2*16*16)
+ MCFG_GFXDECODE(gberet)
+ MCFG_PALETTE_LENGTH(2*16*16)
- MDRV_PALETTE_INIT(gberet)
- MDRV_VIDEO_START(gberet)
- MDRV_VIDEO_UPDATE(gberet)
+ MCFG_PALETTE_INIT(gberet)
+ MCFG_VIDEO_START(gberet)
+ MCFG_VIDEO_UPDATE(gberet)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489A, MASTER_CLOCK/12) /* type verified on real and bootleg pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76489A, MASTER_CLOCK/12) /* type verified on real and bootleg pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gberetb, gberet )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gberetb_map)
- MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 16) // 1 IRQ + 8 NMI
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gberetb_map)
+ MCFG_CPU_VBLANK_INT_HACK(gberet_interrupt, 16) // 1 IRQ + 8 NMI
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_GFXDECODE(gberetb)
+ MCFG_GFXDECODE(gberetb)
- MDRV_VIDEO_UPDATE(gberetb)
+ MCFG_VIDEO_UPDATE(gberetb)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mrgoemon, gberet )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mrgoemon_map)
- MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 16) // 1 IRQ + 8 NMI
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mrgoemon_map)
+ MCFG_CPU_VBLANK_INT_HACK(gberet_interrupt, 16) // 1 IRQ + 8 NMI
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index df5ccb96fd8..823f4d53f76 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -310,45 +310,45 @@ static MACHINE_RESET( gbusters )
static MACHINE_CONFIG_START( gbusters, gbusters_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* Konami custom 052526 */
- MDRV_CPU_PROGRAM_MAP(gbusters_map)
- MDRV_CPU_VBLANK_INT("screen", gbusters_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* Konami custom 052526 */
+ MCFG_CPU_PROGRAM_MAP(gbusters_map)
+ MCFG_CPU_VBLANK_INT("screen", gbusters_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(gbusters_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
+ MCFG_CPU_PROGRAM_MAP(gbusters_sound_map)
- MDRV_MACHINE_START(gbusters)
- MDRV_MACHINE_RESET(gbusters)
+ MCFG_MACHINE_START(gbusters)
+ MCFG_MACHINE_RESET(gbusters)
/* 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(14*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(gbusters)
- MDRV_VIDEO_UPDATE(gbusters)
+ MCFG_VIDEO_START(gbusters)
+ MCFG_VIDEO_UPDATE(gbusters)
- MDRV_K052109_ADD("k052109", gbusters_k052109_intf)
- MDRV_K051960_ADD("k051960", gbusters_k051960_intf)
+ MCFG_K052109_ADD("k052109", gbusters_k052109_intf)
+ MCFG_K051960_ADD("k051960", gbusters_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index c4d8666e297..9fca34e3604 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -436,36 +436,36 @@ static MACHINE_RESET( gcpinbal )
static MACHINE_CONFIG_START( gcpinbal, gcpinbal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16 MHz ? */
- MDRV_CPU_PROGRAM_MAP(gcpinbal_map)
- MDRV_CPU_VBLANK_INT("screen", gcpinbal_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(gcpinbal_map)
+ MCFG_CPU_VBLANK_INT("screen", gcpinbal_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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) /* frames per second, vblank duration */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_MACHINE_START(gcpinbal)
- MDRV_MACHINE_RESET(gcpinbal)
+ MCFG_MACHINE_START(gcpinbal)
+ MCFG_MACHINE_RESET(gcpinbal)
- MDRV_GFXDECODE(gcpinbal)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(gcpinbal)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(gcpinbal)
- MDRV_VIDEO_UPDATE(gcpinbal)
+ MCFG_VIDEO_START(gcpinbal)
+ MCFG_VIDEO_UPDATE(gcpinbal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index cd9b327e2b2..8acae5ef8d4 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -1048,117 +1048,117 @@ static const ppi8255_interface findout_ppi8255_intf[2] =
};
static MACHINE_CONFIG_START( getrivia, driver_device )
- MDRV_CPU_ADD("maincpu",Z80,4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(getrivia_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu",Z80,4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(getrivia_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 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(48, 511-48, 16, 255-16)
+ 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(48, 511-48, 16, 255-16)
- MDRV_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(gei)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(gei)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_VIDEO_START(generic_bitmapped)
- MDRV_VIDEO_UPDATE(generic_bitmapped)
+ MCFG_VIDEO_START(generic_bitmapped)
+ MCFG_VIDEO_UPDATE(generic_bitmapped)
- MDRV_PPI8255_ADD( "ppi8255_0", getrivia_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", getrivia_ppi8255_intf[1] )
- MDRV_TICKET_DISPENSER_ADD("ticket", 100, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_PPI8255_ADD( "ppi8255_0", getrivia_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", getrivia_ppi8255_intf[1] )
+ MCFG_TICKET_DISPENSER_ADD("ticket", 100, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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
static MACHINE_CONFIG_DERIVED( findout, getrivia )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(findout_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(findout_map)
- MDRV_PPI8255_RECONFIG( "ppi8255_0", findout_ppi8255_intf[0] )
- MDRV_PPI8255_RECONFIG( "ppi8255_1", findout_ppi8255_intf[1] )
+ MCFG_PPI8255_RECONFIG( "ppi8255_0", findout_ppi8255_intf[0] )
+ MCFG_PPI8255_RECONFIG( "ppi8255_1", findout_ppi8255_intf[1] )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizvid, findout )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(quizvid_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(quizvid_map)
- MDRV_PALETTE_INIT(quizvid)
+ MCFG_PALETTE_INIT(quizvid)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gselect, getrivia )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("ticket")
+ MCFG_DEVICE_REMOVE("ticket")
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gselect_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gselect_map)
- MDRV_PPI8255_RECONFIG( "ppi8255_0", gselect_ppi8255_intf[0] )
- MDRV_PPI8255_RECONFIG( "ppi8255_1", gselect_ppi8255_intf[1] )
+ MCFG_PPI8255_RECONFIG( "ppi8255_0", gselect_ppi8255_intf[0] )
+ MCFG_PPI8255_RECONFIG( "ppi8255_1", gselect_ppi8255_intf[1] )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jokpokera, getrivia )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("ticket")
+ MCFG_DEVICE_REMOVE("ticket")
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gselect_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gselect_map)
- MDRV_PPI8255_RECONFIG( "ppi8255_0", gselect_ppi8255_intf[0] )
+ MCFG_PPI8255_RECONFIG( "ppi8255_0", gselect_ppi8255_intf[0] )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( amuse, getrivia )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(amuse_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(amuse_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gepoker, getrivia )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gepoker_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gepoker_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( amuse1, getrivia )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(amuse1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(amuse1_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( suprpokr, getrivia )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(suprpokr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(suprpokr_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( geimulti, getrivia )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(geimulti_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(geimulti_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sprtauth, getrivia )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sprtauth_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sprtauth_map)
MACHINE_CONFIG_END
/***************************************************
diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c
index 9782694d2ca..0af1fcac15e 100644
--- a/src/mame/drivers/ggconnie.c
+++ b/src/mame/drivers/ggconnie.c
@@ -145,31 +145,31 @@ static const c6280_interface c6280_config =
static MACHINE_CONFIG_START( ggconnie, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(sgx_mem)
- MDRV_CPU_IO_MAP(sgx_io)
- MDRV_CPU_VBLANK_INT_HACK(sgx_interrupt, VDC_LPF)
+ MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
+ MCFG_CPU_PROGRAM_MAP(sgx_mem)
+ MCFG_CPU_IO_MAP(sgx_io)
+ MCFG_CPU_VBLANK_INT_HACK(sgx_interrupt, VDC_LPF)
- MDRV_QUANTUM_TIME(HZ(60))
+ MCFG_QUANTUM_TIME(HZ(60))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242)
- /* MDRV_GFXDECODE( pce_gfxdecodeinfo ) */
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT( vce )
+ /* MCFG_GFXDECODE( pce_gfxdecodeinfo ) */
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT( vce )
- MDRV_VIDEO_START( pce )
- MDRV_VIDEO_UPDATE( pce )
+ MCFG_VIDEO_START( pce )
+ MCFG_VIDEO_UPDATE( pce )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MDRV_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
- MDRV_SOUND_CONFIG(c6280_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
+ MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
+ MCFG_SOUND_CONFIG(c6280_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index da03edb143a..14af9cb5493 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -426,30 +426,30 @@ static MACHINE_RESET( bballoon )
static MACHINE_CONFIG_START( bballoon, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM9, 200000000)
- MDRV_CPU_PROGRAM_MAP(bballoon_map)
+ MCFG_CPU_ADD("maincpu", ARM9, 200000000)
+ MCFG_CPU_PROGRAM_MAP(bballoon_map)
- 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_RGB32)
- MDRV_SCREEN_SIZE(455, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(455, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_MACHINE_RESET( bballoon )
+ MCFG_MACHINE_RESET( bballoon )
- MDRV_VIDEO_START(s3c2410)
- MDRV_VIDEO_UPDATE(s3c2410)
+ MCFG_VIDEO_START(s3c2410)
+ MCFG_VIDEO_UPDATE(s3c2410)
- MDRV_S3C2410_ADD("s3c2410", 12000000, bballoon_s3c2410_intf)
+ MCFG_S3C2410_ADD("s3c2410", 12000000, bballoon_s3c2410_intf)
-// MDRV_NAND_ADD("nand", 0xEC, 0x75)
-// MDRV_DEVICE_CONFIG(bballoon_nand_intf)
+// MCFG_NAND_ADD("nand", 0xEC, 0x75)
+// MCFG_DEVICE_CONFIG(bballoon_nand_intf)
-// MDRV_I2CMEM_ADD("i2cmem", 0xA0, 0, 0x100, NULL)
- MDRV_I2CMEM_ADD("i2cmem", i2cmem_interface)
+// MCFG_I2CMEM_ADD("i2cmem", 0xA0, 0, 0x100, NULL)
+ MCFG_I2CMEM_ADD("i2cmem", i2cmem_interface)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index 0dd91a66988..fa32e6964cf 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -299,44 +299,44 @@ static MACHINE_RESET( gijoe )
static MACHINE_CONFIG_START( gijoe, gijoe_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* Confirmed */
- MDRV_CPU_PROGRAM_MAP(gijoe_map)
- MDRV_CPU_VBLANK_INT("screen", gijoe_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* Confirmed */
+ MCFG_CPU_PROGRAM_MAP(gijoe_map)
+ MCFG_CPU_VBLANK_INT("screen", gijoe_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* Amuse & confirmed. z80e */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* Amuse & confirmed. z80e */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(gijoe)
- MDRV_MACHINE_RESET(gijoe)
+ MCFG_MACHINE_START(gijoe)
+ MCFG_MACHINE_RESET(gijoe)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_UPDATE_BEFORE_VBLANK)
- 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(24, 24+288-1, 16, 16+224-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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(24, 24+288-1, 16, 16+224-1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(gijoe)
- MDRV_VIDEO_UPDATE(gijoe)
+ MCFG_VIDEO_START(gijoe)
+ MCFG_VIDEO_UPDATE(gijoe)
- MDRV_K056832_ADD("k056832", gijoe_k056832_intf)
- MDRV_K053246_ADD("k053246", gijoe_k053247_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K056832_ADD("k056832", gijoe_k056832_intf)
+ MCFG_K053246_ADD("k053246", gijoe_k053247_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("k054539", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("k054539", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index 5996faeb371..b6af04bdfe1 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -340,39 +340,39 @@ static MACHINE_RESET( ginganin )
static MACHINE_CONFIG_START( ginganin, ginganin_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 6000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(ginganin_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) /* ? (vectors 1-7 cointain the same address) */
+ MCFG_CPU_ADD("maincpu", M68000, 6000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(ginganin_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold) /* ? (vectors 1-7 cointain the same address) */
- MDRV_CPU_ADD("audiocpu", M6809, 1000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(ginganin_sound_interrupt,60) /* Takahiro Nogi. 1999/09/27 (1 -> 60) */
+ MCFG_CPU_ADD("audiocpu", M6809, 1000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(ginganin_sound_interrupt,60) /* Takahiro Nogi. 1999/09/27 (1 -> 60) */
- MDRV_MACHINE_START(ginganin)
- MDRV_MACHINE_RESET(ginganin)
+ MCFG_MACHINE_START(ginganin)
+ MCFG_MACHINE_RESET(ginganin)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0 + 16 , 255 - 16)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0 + 16 , 255 - 16)
- MDRV_GFXDECODE(ginganin)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ginganin)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(ginganin)
- MDRV_VIDEO_UPDATE(ginganin)
+ MCFG_VIDEO_START(ginganin)
+ MCFG_VIDEO_UPDATE(ginganin)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 3579545 / 2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("aysnd", AY8910, 3579545 / 2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("ymsnd", Y8950, 3579545) /* The Y8950 is basically a YM3526 with ADPCM built in */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", Y8950, 3579545) /* The Y8950 is basically a YM3526 with ADPCM built in */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index ba3409b0203..cdd66ee2612 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -663,100 +663,100 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( ppking, gladiatr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ppking_cpu1_map)
- MDRV_CPU_IO_MAP(ppking_cpu1_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(ppking_cpu1_map)
+ MCFG_CPU_IO_MAP(ppking_cpu1_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_IO_MAP(ppking_cpu2_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_IO_MAP(ppking_cpu2_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", M6809, XTAL_12MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ppking_cpu3_map)
+ MCFG_CPU_ADD("audiocpu", M6809, XTAL_12MHz/16) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(ppking_cpu3_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET(ppking)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(ppking)
+ 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(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_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)
- MDRV_GFXDECODE(ppking)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ppking)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(ppking)
- MDRV_VIDEO_UPDATE(ppking)
+ MCFG_VIDEO_START(ppking)
+ MCFG_VIDEO_UPDATE(ppking)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ppking_ym2203_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ROUTE(2, "mono", 0.60)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
-
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ppking_ym2203_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ROUTE(2, "mono", 0.60)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
+
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gladiatr, gladiatr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gladiatr_cpu1_map)
- MDRV_CPU_IO_MAP(gladiatr_cpu1_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(gladiatr_cpu1_map)
+ MCFG_CPU_IO_MAP(gladiatr_cpu1_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_IO_MAP(gladiatr_cpu2_io)
+ MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_IO_MAP(gladiatr_cpu2_io)
- MDRV_CPU_ADD("audiocpu", M6809, XTAL_12MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gladiatr_cpu3_map)
+ MCFG_CPU_ADD("audiocpu", M6809, XTAL_12MHz/16) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(gladiatr_cpu3_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(gladiator)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(gladiator)
+ 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(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_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)
- MDRV_GFXDECODE(gladiatr)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(gladiatr)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(gladiatr)
- MDRV_VIDEO_UPDATE(gladiatr)
+ MCFG_VIDEO_START(gladiatr)
+ MCFG_VIDEO_UPDATE(gladiatr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(gladiatr_ym2203_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ROUTE(2, "mono", 0.60)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
-
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(gladiatr_ym2203_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ROUTE(2, "mono", 0.60)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
+
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 0c664f179c6..d9773c997ce 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -197,32 +197,32 @@ static MACHINE_RESET( glass )
static MACHINE_CONFIG_START( glass, glass_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (M680000 P12) */
- MDRV_CPU_PROGRAM_MAP(glass_map)
- MDRV_CPU_VBLANK_INT("screen", glass_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (M680000 P12) */
+ MCFG_CPU_PROGRAM_MAP(glass_map)
+ MCFG_CPU_VBLANK_INT("screen", glass_interrupt)
- MDRV_MACHINE_START(glass)
- MDRV_MACHINE_RESET(glass)
+ MCFG_MACHINE_START(glass)
+ MCFG_MACHINE_RESET(glass)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 368-1, 16, 256-1)
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 368-1, 16, 256-1)
- MDRV_GFXDECODE(glass)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(glass)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(glass)
- MDRV_VIDEO_UPDATE(glass)
+ MCFG_VIDEO_START(glass)
+ MCFG_VIDEO_UPDATE(glass)
/* 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
ROM_START( glass ) /* Version 1.1 */
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 8f061fc46dd..44e1e4e67bf 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -326,48 +326,48 @@ static MACHINE_RESET( gng )
static MACHINE_CONFIG_START( gng, gng_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gng_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(gng_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
- MDRV_MACHINE_START(gng)
- MDRV_MACHINE_RESET(gng)
+ MCFG_MACHINE_START(gng)
+ MCFG_MACHINE_RESET(gng)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.59) /* verified on pcb */
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.59) /* verified on pcb */
+ 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)
- MDRV_GFXDECODE(gng)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(gng)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(gng)
- MDRV_VIDEO_EOF(gng)
- MDRV_VIDEO_UPDATE(gng)
+ MCFG_VIDEO_START(gng)
+ MCFG_VIDEO_EOF(gng)
+ MCFG_VIDEO_UPDATE(gng)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ROUTE(2, "mono", 0.40)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
-
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ROUTE(2, "mono", 0.40)
- MDRV_SOUND_ROUTE(3, "mono", 0.20)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ROUTE(2, "mono", 0.40)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
+
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ROUTE(2, "mono", 0.40)
+ MCFG_SOUND_ROUTE(3, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index 798fde396d0..8ac7c8e04d8 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -320,35 +320,35 @@ static MACHINE_START( go2000 )
static MACHINE_CONFIG_START( go2000, go2000_state )
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(go2000_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(go2000_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(go2000_sound_map)
- MDRV_CPU_IO_MAP(go2000_sound_io)
+ MCFG_CPU_ADD("soundcpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(go2000_sound_map)
+ MCFG_CPU_IO_MAP(go2000_sound_io)
- MDRV_MACHINE_START(go2000)
+ MCFG_MACHINE_START(go2000)
- MDRV_GFXDECODE(go2000)
+ MCFG_GFXDECODE(go2000)
- 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, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(go2000)
- MDRV_VIDEO_UPDATE(go2000)
+ MCFG_VIDEO_START(go2000)
+ MCFG_VIDEO_UPDATE(go2000)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
ROM_START( go2000 )
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index a74b3c6d64e..0f71e10053b 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -316,45 +316,45 @@ static MACHINE_RESET( goal92 )
static MACHINE_CONFIG_START( goal92, goal92_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(goal92_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold) /* VBL */
+ MCFG_CPU_ADD("maincpu", M68000,12000000)
+ MCFG_CPU_PROGRAM_MAP(goal92_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold) /* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, 2500000)
- MDRV_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_CPU_ADD("audiocpu", Z80, 2500000)
+ MCFG_CPU_PROGRAM_MAP(sound_cpu)
/* IRQs are triggered by the main CPU */
- MDRV_MACHINE_START(goal92)
- MDRV_MACHINE_RESET(goal92)
+ MCFG_MACHINE_START(goal92)
+ MCFG_MACHINE_RESET(goal92)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) // black border at bottom is a game bug...
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) // black border at bottom is a game bug...
- MDRV_GFXDECODE(goal92)
- MDRV_PALETTE_LENGTH(128*16)
+ MCFG_GFXDECODE(goal92)
+ MCFG_PALETTE_LENGTH(128*16)
- MDRV_VIDEO_START(goal92)
- MDRV_VIDEO_UPDATE(goal92)
- MDRV_VIDEO_EOF(goal92)
+ MCFG_VIDEO_START(goal92)
+ MCFG_VIDEO_UPDATE(goal92)
+ MCFG_VIDEO_EOF(goal92)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 2500000/2)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ym1", YM2203, 2500000/2)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ym2", YM2203, 2500000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ym2", YM2203, 2500000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 266362b8a4a..0b001882cf0 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -246,37 +246,37 @@ static MACHINE_RESET( goindol )
static MACHINE_CONFIG_START( goindol, goindol_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */
- MDRV_CPU_PROGRAM_MAP(goindol_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */
+ MCFG_CPU_PROGRAM_MAP(goindol_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
- MDRV_MACHINE_START(goindol)
- MDRV_MACHINE_RESET(goindol)
+ MCFG_MACHINE_START(goindol)
+ MCFG_MACHINE_RESET(goindol)
/* 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)
+ 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)
- MDRV_GFXDECODE(goindol)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(goindol)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(goindol)
- MDRV_VIDEO_UPDATE(goindol)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(goindol)
+ MCFG_VIDEO_UPDATE(goindol)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* Confirmed pitch from recording */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* Confirmed pitch from recording */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goldngam.c b/src/mame/drivers/goldngam.c
index 3d6ba1def6c..26304821496 100644
--- a/src/mame/drivers/goldngam.c
+++ b/src/mame/drivers/goldngam.c
@@ -544,40 +544,40 @@ static const ay8910_interface goldngam_ay8910_interface =
static MACHINE_CONFIG_START( swisspkr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(swisspkr_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(swisspkr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_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(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(4*8, 43*8-1, 1*8, 37*8-1) // 312x288
+ 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(4*8, 43*8-1, 1*8, 37*8-1) // 312x288
- MDRV_GFXDECODE(goldngam)
+ MCFG_GFXDECODE(goldngam)
- MDRV_PALETTE_INIT(goldngam)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(goldngam)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(goldngam)
- MDRV_VIDEO_UPDATE(goldngam)
+ MCFG_VIDEO_START(goldngam)
+ MCFG_VIDEO_UPDATE(goldngam)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(goldngam_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(goldngam_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( moviecrd, swisspkr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(moviecrd_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(moviecrd_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index 8d180ef642a..5a2f45c5558 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -2629,161 +2629,161 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( goldnpkr_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(goldnpkr_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(goldnpkr_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", goldnpkr_pia0_intf)
- MDRV_PIA6821_ADD("pia1", goldnpkr_pia1_intf)
+ MCFG_PIA6821_ADD("pia0", goldnpkr_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", goldnpkr_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) /* From MC6845 init, registers 00 & 04 (programmed with value-1). */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 29*8-1) /* From MC6845 init, registers 01 & 06. */
-
- MDRV_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf) /* 68B45 or 6845s @ CPU clock */
-
- MDRV_GFXDECODE(goldnpkr)
- MDRV_PALETTE_INIT(goldnpkr)
- MDRV_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(goldnpkr)
- MDRV_VIDEO_UPDATE(goldnpkr)
+ 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) /* From MC6845 init, registers 00 & 04 (programmed with value-1). */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 29*8-1) /* From MC6845 init, registers 01 & 06. */
+
+ MCFG_MC6845_ADD("crtc", MC6845, CPU_CLOCK, mc6845_intf) /* 68B45 or 6845s @ CPU clock */
+
+ MCFG_GFXDECODE(goldnpkr)
+ MCFG_PALETTE_INIT(goldnpkr)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_VIDEO_START(goldnpkr)
+ MCFG_VIDEO_UPDATE(goldnpkr)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( goldnpkr, goldnpkr_base )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(goldnpkr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(goldnpkr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pottnpkr, goldnpkr_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pottnpkr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pottnpkr_map)
- MDRV_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
+ MCFG_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(pottnpkr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(pottnpkr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( witchcrd, goldnpkr_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(witchcrd_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(witchcrd_map)
- MDRV_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
+ MCFG_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
/* video hardware */
- MDRV_PALETTE_INIT(witchcrd)
+ MCFG_PALETTE_INIT(witchcrd)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(goldnpkr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(goldnpkr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wcfalcon, goldnpkr_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(witchcrd_falcon_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(witchcrd_falcon_map)
- MDRV_PIA6821_MODIFY("pia0", wcfalcon_pia0_intf)
- MDRV_PIA6821_MODIFY("pia1", wcfalcon_pia1_intf)
+ MCFG_PIA6821_MODIFY("pia0", wcfalcon_pia0_intf)
+ MCFG_PIA6821_MODIFY("pia1", wcfalcon_pia1_intf)
/* video hardware */
- MDRV_PALETTE_INIT(witchcrd)
+ MCFG_PALETTE_INIT(witchcrd)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/4) /* guess, seems ok */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/4) /* guess, seems ok */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wildcard, goldnpkr_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wildcard_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wildcard_map)
- MDRV_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
+ MCFG_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
/* video hardware */
-// MDRV_GFXDECODE(wildcard)
- MDRV_PALETTE_INIT(witchcrd)
-// MDRV_VIDEO_START(wildcard)
+// MCFG_GFXDECODE(wildcard)
+ MCFG_PALETTE_INIT(witchcrd)
+// MCFG_VIDEO_START(wildcard)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(goldnpkr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(goldnpkr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wildcrdb, goldnpkr_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wildcrdb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wildcrdb_map)
- MDRV_CPU_ADD("mcu", Z80, MASTER_CLOCK/4) /* guess */
- MDRV_CPU_PROGRAM_MAP(wildcrdb_mcu_map)
- MDRV_CPU_IO_MAP(wildcrdb_mcu_io_map)
+ MCFG_CPU_ADD("mcu", Z80, MASTER_CLOCK/4) /* guess */
+ MCFG_CPU_PROGRAM_MAP(wildcrdb_mcu_map)
+ MCFG_CPU_IO_MAP(wildcrdb_mcu_io_map)
- MDRV_PIA6821_MODIFY("pia0", wcfalcon_pia0_intf)
- MDRV_PIA6821_MODIFY("pia1", wcfalcon_pia1_intf)
+ MCFG_PIA6821_MODIFY("pia0", wcfalcon_pia0_intf)
+ MCFG_PIA6821_MODIFY("pia1", wcfalcon_pia1_intf)
/* video hardware */
-// MDRV_GFXDECODE(wildcard)
- MDRV_PALETTE_INIT(witchcrd)
-// MDRV_VIDEO_START(wildcard)
+// MCFG_GFXDECODE(wildcard)
+ MCFG_PALETTE_INIT(witchcrd)
+// MCFG_VIDEO_START(wildcard)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/4) /* guess, seems ok */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/4) /* guess, seems ok */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( genie, goldnpkr_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(genie_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(genie_map)
- MDRV_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
+ MCFG_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf)
/* video hardware */
- MDRV_PALETTE_INIT(witchcrd)
+ MCFG_PALETTE_INIT(witchcrd)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(goldnpkr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(goldnpkr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 9e07ccf5037..023ed30a5e6 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -5499,34 +5499,34 @@ static const ay8910_interface ladylinr_ay8910_config =
static MACHINE_CONFIG_START( goldstar, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(goldstar_map)
- MDRV_CPU_IO_MAP(goldstar_readport)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(goldstar_map)
+ MCFG_CPU_IO_MAP(goldstar_readport)
+ 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(goldstar)
- MDRV_PALETTE_LENGTH(256)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(goldstar)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -5534,68 +5534,68 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( goldstbl, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(goldstar_map)
- MDRV_CPU_IO_MAP(goldstar_readport)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(goldstar_map)
+ MCFG_CPU_IO_MAP(goldstar_readport)
+ 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(bl)
- MDRV_PALETTE_LENGTH(256)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(bl)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( moonlght, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(goldstar_map)
- MDRV_CPU_IO_MAP(goldstar_readport)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(goldstar_map)
+ MCFG_CPU_IO_MAP(goldstar_readport)
+ 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(ml)
- MDRV_PALETTE_LENGTH(256)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(ml)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -5663,41 +5663,41 @@ static PALETTE_INIT(lucky8)
static MACHINE_CONFIG_START( chrygld, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ncb3_map)
- MDRV_CPU_IO_MAP(ncb3_readwriteport)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(ncb3_map)
+ MCFG_CPU_IO_MAP(ncb3_readwriteport)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 3x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", ncb3_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ncb3_ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", ncb3_ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ncb3_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ncb3_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", ncb3_ppi8255_intf[2] )
/* 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, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(chry10)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(chry10)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -5705,123 +5705,123 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cb3c, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ncb3_map)
- MDRV_CPU_IO_MAP(ncb3_readwriteport)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(ncb3_map)
+ MCFG_CPU_IO_MAP(ncb3_readwriteport)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 3x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", ncb3_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ncb3_ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", ncb3_ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ncb3_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ncb3_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", ncb3_ppi8255_intf[2] )
/* 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, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(cb3c)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(cb3c)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ncb3, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ncb3_map)
- MDRV_CPU_IO_MAP(ncb3_readwriteport)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(ncb3_map)
+ MCFG_CPU_IO_MAP(ncb3_readwriteport)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 3x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", ncb3_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ncb3_ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", ncb3_ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ncb3_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ncb3_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", ncb3_ppi8255_intf[2] )
/* 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, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(ncb3)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
+ MCFG_GFXDECODE(ncb3)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cm, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map)
- MDRV_CPU_IO_MAP(cm_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cm_map)
+ MCFG_CPU_IO_MAP(cm_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(cmbitmap)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(cmbitmap)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(cherrym)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(cherrym)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(cm_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(cm_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cmasterc, cm )
- MDRV_GFXDECODE(cmasterc)
+ MCFG_GFXDECODE(cmasterc)
MACHINE_CONFIG_END
@@ -5829,72 +5829,72 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cmnobmp, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map)
- MDRV_CPU_IO_MAP(cm_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cm_map)
+ MCFG_CPU_IO_MAP(cm_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(cm)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(cm)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(cherrym)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(cherrym)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(cm_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(cm_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
#endif
static MACHINE_CONFIG_START( cmast91, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map)
- MDRV_CPU_IO_MAP(cmast91_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cm_map)
+ MCFG_CPU_IO_MAP(cmast91_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(cmast91)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cmast91)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(cmast91)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cmast91)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(cherrym)
- MDRV_VIDEO_UPDATE(cmast91)
+ MCFG_VIDEO_START(cherrym)
+ MCFG_VIDEO_UPDATE(cmast91)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(cm_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(cm_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static INTERRUPT_GEN( lucky8_irq )
@@ -5908,41 +5908,41 @@ static INTERRUPT_GEN( lucky8_irq )
static MACHINE_CONFIG_START( lucky8, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(lucky8_map)
- //MDRV_CPU_IO_MAP(goldstar_readport)
- MDRV_CPU_VBLANK_INT("screen", lucky8_irq)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(lucky8_map)
+ //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_CPU_VBLANK_INT("screen", lucky8_irq)
/* 3x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", lucky8_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", lucky8_ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", lucky8_ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", lucky8_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", lucky8_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", lucky8_ppi8255_intf[2] )
/* 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, 64*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(lucky8)
+ 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, 64*8-1, 2*8, 30*8-1)
+ MCFG_PALETTE_INIT(lucky8)
- MDRV_GFXDECODE(ncb3)
- MDRV_PALETTE_LENGTH(256)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(ncb3)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(lucky8_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(lucky8_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -5966,78 +5966,78 @@ static PALETTE_INIT(magical)
static MACHINE_CONFIG_START( magical, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(magical_map)
- //MDRV_CPU_IO_MAP(goldstar_readport)
- MDRV_CPU_VBLANK_INT("screen", lucky8_irq)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(magical_map)
+ //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_CPU_VBLANK_INT("screen", lucky8_irq)
/* 3x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", lucky8_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", lucky8_ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", lucky8_ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", lucky8_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", lucky8_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", lucky8_ppi8255_intf[2] )
/* 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, 64*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(magical)
+ 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, 64*8-1, 2*8, 30*8-1)
+ MCFG_PALETTE_INIT(magical)
- MDRV_GFXDECODE(magical)
- MDRV_PALETTE_LENGTH(256)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(magical)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(magical)
- MDRV_VIDEO_UPDATE(magical)
+ MCFG_VIDEO_START(magical)
+ MCFG_VIDEO_UPDATE(magical)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.00) // shut up annoying whine
+ MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.00) // shut up annoying whine
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(lucky8_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(lucky8_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kkojnoli, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(kkojnoli_map)
- //MDRV_CPU_IO_MAP(goldstar_readport)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(kkojnoli_map)
+ //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 3x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", kkojnoli_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", kkojnoli_ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", kkojnoli_ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", kkojnoli_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", kkojnoli_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", kkojnoli_ppi8255_intf[2] )
/* 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, 64*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(lucky8)
+ 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, 64*8-1, 2*8, 30*8-1)
+ MCFG_PALETTE_INIT(lucky8)
- MDRV_GFXDECODE(ncb3)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(ncb3)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -6045,81 +6045,81 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ladylinr, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ladylinr_map)
- //MDRV_CPU_IO_MAP(goldstar_readport)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(ladylinr_map)
+ //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", ladylinr_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ladylinr_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ladylinr_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ladylinr_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(lucky8)
+ 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, 64*8-1, 2*8, 30*8-1)
+ MCFG_PALETTE_INIT(lucky8)
- MDRV_GFXDECODE(ncb3)
- MDRV_PALETTE_LENGTH(256)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(ncb3)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono'
+ MCFG_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono'
- MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(ladylinr_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(ladylinr_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wcat3, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(wcat3_map)
- //MDRV_CPU_IO_MAP(goldstar_readport)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(wcat3_map)
+ //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 3x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", lucky8_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", lucky8_ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", lucky8_ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", lucky8_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", lucky8_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", lucky8_ppi8255_intf[2] )
/* 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, 64*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(lucky8)
+ 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, 64*8-1, 2*8, 30*8-1)
+ MCFG_PALETTE_INIT(lucky8)
- MDRV_GFXDECODE(ncb3)
- MDRV_PALETTE_LENGTH(256)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(ncb3)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(goldstar)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(goldstar)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(lucky8_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(lucky8_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -6128,39 +6128,39 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( amcoe1, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map)
- MDRV_CPU_IO_MAP(amcoe1_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cm_map)
+ MCFG_CPU_IO_MAP(amcoe1_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(cm)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(cm)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(cherrym)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(cherrym)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(cm_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(cm_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -6168,39 +6168,39 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( amcoe1a, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map)
- MDRV_CPU_IO_MAP(amcoe1_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cm_map)
+ MCFG_CPU_IO_MAP(amcoe1_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(cm)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(cm)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(cherrym)
- MDRV_VIDEO_UPDATE(amcoe1a)
+ MCFG_VIDEO_START(cherrym)
+ MCFG_VIDEO_UPDATE(amcoe1a)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(cm_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(cm_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -6208,108 +6208,108 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( amcoe2, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map)
- MDRV_CPU_IO_MAP(amcoe2_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cm_map)
+ MCFG_CPU_IO_MAP(amcoe2_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(cm)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(cm)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(cherrym)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(cherrym)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(cm_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) /* analyzed for clips */
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(cm_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) /* analyzed for clips */
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( nfm, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(nfm_map)
- MDRV_CPU_IO_MAP(amcoe2_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(nfm_map)
+ MCFG_CPU_IO_MAP(amcoe2_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nfm)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(nfm)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(cherrym)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(cherrym)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(cm_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) /* analyzed for clips */
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(cm_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) /* analyzed for clips */
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( unkch, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(unkch_map)
- MDRV_CPU_IO_MAP(unkch_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
- //MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(unkch_map)
+ MCFG_CPU_IO_MAP(unkch_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ //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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(unkch)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(unkch)
+ MCFG_PALETTE_LENGTH(512)
- //MDRV_NVRAM_HANDLER(goldstar)
+ //MCFG_NVRAM_HANDLER(goldstar)
- MDRV_VIDEO_START(unkch)
- MDRV_VIDEO_UPDATE(unkch)
+ MCFG_VIDEO_START(unkch)
+ MCFG_VIDEO_UPDATE(unkch)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
-// MDRV_SOUND_CONFIG(ay8910_config)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+// MCFG_SOUND_CONFIG(ay8910_config)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cherrys, ncb3 )
- MDRV_GFXDECODE(cherrys)
+ MCFG_GFXDECODE(cherrys)
MACHINE_CONFIG_END
@@ -6317,36 +6317,36 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pkrmast, goldstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cm_map)
- MDRV_CPU_IO_MAP(cm_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cm_map)
+ MCFG_CPU_IO_MAP(cm_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 2x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", cm_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", cm_ppi8255_intf[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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pkrmast)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(cm)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_GFXDECODE(pkrmast)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(cm)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_START(cherrym)
- MDRV_VIDEO_UPDATE(goldstar)
+ MCFG_VIDEO_START(cherrym)
+ MCFG_VIDEO_UPDATE(goldstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
- MDRV_SOUND_CONFIG(cm_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_SOUND_CONFIG(cm_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index 80091be94b7..a2bf8e11f2d 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -119,30 +119,30 @@ GFXDECODE_END
static MACHINE_CONFIG_START( gomoku, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/12) /* 1.536 MHz ? */
- MDRV_CPU_PROGRAM_MAP(gomoku_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/12) /* 1.536 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(gomoku_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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_GFXDECODE(gomoku)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(gomoku)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(gomoku)
- MDRV_VIDEO_START(gomoku)
- MDRV_VIDEO_UPDATE(gomoku)
+ MCFG_PALETTE_INIT(gomoku)
+ MCFG_VIDEO_START(gomoku)
+ MCFG_VIDEO_UPDATE(gomoku)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("gomoku", GOMOKU, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("gomoku", GOMOKU, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index d5a9b10e18c..670baa34c3d 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -274,29 +274,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( good, good_state )
- MDRV_CPU_ADD("maincpu", M68000, 16000000 /2)
- MDRV_CPU_PROGRAM_MAP(good_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000 /2)
+ MCFG_CPU_PROGRAM_MAP(good_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_GFXDECODE(good)
+ MCFG_GFXDECODE(good)
- 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(1*16, 23*16-1, 0*16, 14*16-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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(1*16, 23*16-1, 0*16, 14*16-1)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(good)
- MDRV_VIDEO_UPDATE(good)
+ MCFG_VIDEO_START(good)
+ MCFG_VIDEO_UPDATE(good)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 041f59bfc23..158bb2c4af6 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -325,36 +325,36 @@ static INTERRUPT_GEN( goodejan_irq )
static MACHINE_CONFIG_START( goodejan, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30, GOODEJAN_MHZ2/2)
- MDRV_CPU_PROGRAM_MAP(goodejan_map)
- MDRV_CPU_IO_MAP(goodejan_io_map)
- MDRV_CPU_VBLANK_INT("screen",goodejan_irq)
+ MCFG_CPU_ADD("maincpu", V30, GOODEJAN_MHZ2/2)
+ MCFG_CPU_PROGRAM_MAP(goodejan_map)
+ MCFG_CPU_IO_MAP(goodejan_io_map)
+ MCFG_CPU_VBLANK_INT("screen",goodejan_irq)
SEIBU_SOUND_SYSTEM_CPU(GOODEJAN_MHZ1/2)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* 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) //TODO: dynamic resolution
+ 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) //TODO: dynamic resolution
- MDRV_GFXDECODE(goodejan)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(goodejan)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(seibu_crtc)
- MDRV_VIDEO_UPDATE(seibu_crtc)
+ MCFG_VIDEO_START(seibu_crtc)
+ MCFG_VIDEO_UPDATE(seibu_crtc)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(GOODEJAN_MHZ1/2,GOODEJAN_MHZ2/16)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( totmejan, goodejan )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(totmejan_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(totmejan_io_map)
MACHINE_CONFIG_END
ROM_START( totmejan )
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 85caf604b1a..4de0b3cadf3 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -276,41 +276,41 @@ static MACHINE_RESET( gotcha )
static MACHINE_CONFIG_START( gotcha, gotcha_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,14318180) /* 14.31818 MHz */
- MDRV_CPU_PROGRAM_MAP(gotcha_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,14318180) /* 14.31818 MHz */
+ MCFG_CPU_PROGRAM_MAP(gotcha_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
-// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+// MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(gotcha)
- MDRV_MACHINE_RESET(gotcha)
+ MCFG_MACHINE_START(gotcha)
+ MCFG_MACHINE_RESET(gotcha)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(gotcha)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(gotcha)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(gotcha)
- MDRV_VIDEO_UPDATE(gotcha)
+ MCFG_VIDEO_START(gotcha)
+ MCFG_VIDEO_UPDATE(gotcha)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.80)
- MDRV_SOUND_ROUTE(1, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 14318180/4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.80)
+ MCFG_SOUND_ROUTE(1, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 1b58faf28ea..f94338f837f 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -1919,54 +1919,54 @@ static const samples_interface reactor_samples_interface =
static MACHINE_CONFIG_START( gottlieb_core, gottlieb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8088, CPU_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(gottlieb_map)
- MDRV_CPU_VBLANK_INT("screen", gottlieb_interrupt)
+ MCFG_CPU_ADD("maincpu", I8088, CPU_CLOCK/3)
+ MCFG_CPU_PROGRAM_MAP(gottlieb_map)
+ MCFG_CPU_VBLANK_INT("screen", gottlieb_interrupt)
- MDRV_MACHINE_START(gottlieb)
- MDRV_MACHINE_RESET(gottlieb)
- MDRV_NVRAM_ADD_1FILL("nvram")
- MDRV_WATCHDOG_VBLANK_INIT(16)
+ MCFG_MACHINE_START(gottlieb)
+ MCFG_MACHINE_RESET(gottlieb)
+ MCFG_NVRAM_ADD_1FILL("nvram")
+ MCFG_WATCHDOG_VBLANK_INIT(16)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(SYSTEM_CLOCK/4, GOTTLIEB_VIDEO_HCOUNT, 0, GOTTLIEB_VIDEO_HBLANK, GOTTLIEB_VIDEO_VCOUNT, 0, GOTTLIEB_VIDEO_VBLANK)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(SYSTEM_CLOCK/4, GOTTLIEB_VIDEO_HCOUNT, 0, GOTTLIEB_VIDEO_HBLANK, GOTTLIEB_VIDEO_VCOUNT, 0, GOTTLIEB_VIDEO_VBLANK)
- MDRV_GFXDECODE(gfxdecode)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(gfxdecode)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(gottlieb)
- MDRV_VIDEO_UPDATE(gottlieb)
+ MCFG_VIDEO_START(gottlieb)
+ MCFG_VIDEO_UPDATE(gottlieb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gottlieb1, gottlieb_core )
- MDRV_FRAGMENT_ADD(gottlieb_soundrev1)
+ MCFG_FRAGMENT_ADD(gottlieb_soundrev1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gottlieb2, gottlieb_core )
- MDRV_FRAGMENT_ADD(gottlieb_soundrev2)
+ MCFG_FRAGMENT_ADD(gottlieb_soundrev2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( g2laser, gottlieb_core )
- MDRV_FRAGMENT_ADD(gottlieb_soundrev2)
+ MCFG_FRAGMENT_ADD(gottlieb_soundrev2)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_PR8210, "screen", "ldsound")
- MDRV_LASERDISC_AUDIO(laserdisc_audio_process)
- MDRV_LASERDISC_OVERLAY(gottlieb, GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, BITMAP_FORMAT_INDEXED16)
- MDRV_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_PR8210, "screen", "ldsound")
+ MCFG_LASERDISC_AUDIO(laserdisc_audio_process)
+ MCFG_LASERDISC_OVERLAY(gottlieb, GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8)
- MDRV_DEVICE_REMOVE("screen")
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_DEVICE_REMOVE("screen")
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
/* right channel is processed as data */
MACHINE_CONFIG_END
@@ -1981,39 +1981,39 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( reactor, gottlieb1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(reactor_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(reactor_map)
- MDRV_DEVICE_REMOVE("nvram")
+ MCFG_DEVICE_REMOVE("nvram")
/* sound hardware */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(reactor_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(reactor_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qbert, gottlieb1 )
/* video hardware */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(qbert_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(qbert_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( screwloo, gottlieb2 )
- MDRV_VIDEO_START(screwloo)
+ MCFG_VIDEO_START(screwloo)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cobram3, g2laser )
/* sound hardware */
- MDRV_SOUND_MODIFY("dac1")
- MDRV_SOUND_ROUTES_RESET()
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_MODIFY("dac1")
+ MCFG_SOUND_ROUTES_RESET()
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 7abb5f31132..070271bac75 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -195,34 +195,34 @@ static MACHINE_RESET( gotya )
static MACHINE_CONFIG_START( gotya, gotya_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(gotya_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(gotya_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(gotya)
- MDRV_MACHINE_RESET(gotya)
+ MCFG_MACHINE_START(gotya)
+ MCFG_MACHINE_RESET(gotya)
/* 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(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 36*8-1, 2*8, 30*8-1)
+ 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(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 36*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(gotya)
- MDRV_PALETTE_LENGTH(16*4)
+ MCFG_GFXDECODE(gotya)
+ MCFG_PALETTE_LENGTH(16*4)
- MDRV_PALETTE_INIT(gotya)
- MDRV_VIDEO_START(gotya)
- MDRV_VIDEO_UPDATE(gotya)
+ MCFG_PALETTE_INIT(gotya)
+ MCFG_VIDEO_START(gotya)
+ MCFG_VIDEO_UPDATE(gotya)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gotya_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gotya_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 56216d91aa3..01cdc3482d2 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -444,28 +444,28 @@ GFXDECODE_END
static MACHINE_CONFIG_START( gpworld, driver_device )
/* main cpu */
- MDRV_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
- MDRV_CPU_PROGRAM_MAP(mainmem)
- MDRV_CPU_IO_MAP(mainport)
- MDRV_CPU_VBLANK_INT("screen", vblank_callback_gpworld)
+ MCFG_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(mainmem)
+ MCFG_CPU_IO_MAP(mainport)
+ MCFG_CPU_VBLANK_INT("screen", vblank_callback_gpworld)
- MDRV_MACHINE_START(gpworld)
+ MCFG_MACHINE_START(gpworld)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(gpworld, 512, 256, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(gpworld, 512, 256, BITMAP_FORMAT_INDEXED16)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(gpworld)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(gpworld)
+ MCFG_PALETTE_LENGTH(1024)
/* sound 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
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 090e2832cb8..3f91c15adf1 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -330,54 +330,54 @@ static MACHINE_RESET( gradius3 )
static MACHINE_CONFIG_START( gradius3, gradius3_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(gradius3_map)
- MDRV_CPU_VBLANK_INT("screen", cpuA_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(gradius3_map)
+ MCFG_CPU_VBLANK_INT("screen", cpuA_interrupt)
- MDRV_CPU_ADD("sub", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(gradius3_map2)
- MDRV_CPU_VBLANK_INT_HACK(cpuB_interrupt,2) /* has three interrupt vectors, 1 2 and 4 */
+ MCFG_CPU_ADD("sub", M68000, 10000000) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(gradius3_map2)
+ MCFG_CPU_VBLANK_INT_HACK(cpuB_interrupt,2) /* has three interrupt vectors, 1 2 and 4 */
/* 4 is triggered by cpu A, the others are unknown but */
/* required for the game to run. */
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(gradius3_s_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(gradius3_s_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(gradius3)
- MDRV_MACHINE_RESET(gradius3)
+ MCFG_MACHINE_START(gradius3)
+ MCFG_MACHINE_RESET(gradius3)
/* 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(12*8, (64-12)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(gradius3)
- MDRV_VIDEO_UPDATE(gradius3)
+ MCFG_VIDEO_START(gradius3)
+ MCFG_VIDEO_UPDATE(gradius3)
- MDRV_K052109_ADD("k052109", gradius3_k052109_intf)
- MDRV_K051960_ADD("k051960", gradius3_k051960_intf)
+ MCFG_K052109_ADD("k052109", gradius3_k052109_intf)
+ MCFG_K051960_ADD("k051960", gradius3_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index ac10a34cc6b..bc7d450a2b4 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -675,55 +675,55 @@ static MACHINE_CONFIG_START( grchamp, grchamp_state )
/* basic machine hardware */
/* CPU BOARD */
- MDRV_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", grchamp_cpu0_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", grchamp_cpu0_interrupt)
/* GAME BOARD */
- MDRV_CPU_ADD("sub", Z80, PIXEL_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_IO_MAP(sub_portmap)
- MDRV_CPU_VBLANK_INT("screen", grchamp_cpu1_interrupt)
+ MCFG_CPU_ADD("sub", Z80, PIXEL_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_IO_MAP(sub_portmap)
+ MCFG_CPU_VBLANK_INT("screen", grchamp_cpu1_interrupt)
/* SOUND BOARD */
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)SOUND_CLOCK/4/16/16/10/16)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, (double)SOUND_CLOCK/4/16/16/10/16)
- MDRV_MACHINE_RESET(grchamp)
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_MACHINE_RESET(grchamp)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_GFXDECODE(grchamp)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_GFXDECODE(grchamp)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(grchamp)
- MDRV_VIDEO_START(grchamp)
- MDRV_VIDEO_UPDATE(grchamp)
+ MCFG_PALETTE_INIT(grchamp)
+ MCFG_VIDEO_START(grchamp)
+ MCFG_VIDEO_UPDATE(grchamp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, SOUND_CLOCK/4) /* 3B */
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
+ MCFG_SOUND_ADD("ay1", AY8910, SOUND_CLOCK/4) /* 3B */
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MDRV_SOUND_ADD("ay2", AY8910, SOUND_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
+ MCFG_SOUND_ADD("ay2", AY8910, SOUND_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MDRV_SOUND_ADD("ay3", AY8910, SOUND_CLOCK/4) /* 1B */
- MDRV_SOUND_CONFIG(ay8910_interface_3)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
+ MCFG_SOUND_ADD("ay3", AY8910, SOUND_CLOCK/4) /* 1B */
+ MCFG_SOUND_CONFIG(ay8910_interface_3)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(grchamp)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(grchamp)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index d9460b9b8d9..7f1657f804c 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -437,33 +437,33 @@ static const samples_interface gridlee_samples_interface =
static MACHINE_CONFIG_START( gridlee, gridlee_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, BALSENTE_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_ADD("maincpu", M6809, BALSENTE_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_MACHINE_START(gridlee)
- MDRV_MACHINE_RESET(gridlee)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(gridlee)
+ MCFG_MACHINE_RESET(gridlee)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(BALSENTE_PIXEL_CLOCK, BALSENTE_HTOTAL, BALSENTE_HBEND, BALSENTE_HBSTART, BALSENTE_VTOTAL, BALSENTE_VBEND, BALSENTE_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(BALSENTE_PIXEL_CLOCK, BALSENTE_HTOTAL, BALSENTE_HBEND, BALSENTE_HBSTART, BALSENTE_VTOTAL, BALSENTE_VBEND, BALSENTE_VBSTART)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_PALETTE_INIT(gridlee)
- MDRV_VIDEO_START(gridlee)
- MDRV_VIDEO_UPDATE(gridlee)
+ MCFG_PALETTE_INIT(gridlee)
+ MCFG_VIDEO_START(gridlee)
+ MCFG_VIDEO_UPDATE(gridlee)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("gridlee", GRIDLEE, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("gridlee", GRIDLEE, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gridlee_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gridlee_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index 912e0dcdc79..f7cbc5a5e68 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -367,31 +367,31 @@ static INTERRUPT_GEN( groundfx_interrupt )
static MACHINE_CONFIG_START( groundfx, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(groundfx_map)
- MDRV_CPU_VBLANK_INT("screen", groundfx_interrupt)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(groundfx_map)
+ MCFG_CPU_VBLANK_INT("screen", groundfx_interrupt)
- MDRV_EEPROM_ADD("eeprom", groundfx_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", groundfx_eeprom_interface)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*8, 32*8-1)
- MDRV_GFXDECODE(groundfx)
- MDRV_PALETTE_LENGTH(16384)
+ MCFG_GFXDECODE(groundfx)
+ MCFG_PALETTE_LENGTH(16384)
- MDRV_VIDEO_START(groundfx)
- MDRV_VIDEO_UPDATE(groundfx)
+ MCFG_VIDEO_START(groundfx)
+ MCFG_VIDEO_UPDATE(groundfx)
- MDRV_TC0100SCN_ADD("tc0100scn", groundfx_tc0100scn_intf)
- MDRV_TC0480SCP_ADD("tc0480scp", groundfx_tc0480scp_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", groundfx_tc0100scn_intf)
+ MCFG_TC0480SCP_ADD("tc0480scp", groundfx_tc0480scp_intf)
/* sound hardware */
- MDRV_FRAGMENT_ADD(taito_f3_sound)
+ MCFG_FRAGMENT_ADD(taito_f3_sound)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index 7425078c340..3de016a3daf 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -550,37 +550,37 @@ static MACHINE_RESET( gstream )
static MACHINE_CONFIG_START( gstream, gstream_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(gstream_32bit_map)
- MDRV_CPU_IO_MAP(gstream_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
+ MCFG_CPU_PROGRAM_MAP(gstream_32bit_map)
+ MCFG_CPU_IO_MAP(gstream_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(gstream)
- MDRV_MACHINE_RESET(gstream)
+ MCFG_MACHINE_START(gstream)
+ MCFG_MACHINE_RESET(gstream)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_LENGTH(0x1000 + 0x400 + 0x400 + 0x400) // sprites + 3 bg layers
- MDRV_GFXDECODE(gstream)
+ MCFG_PALETTE_LENGTH(0x1000 + 0x400 + 0x400 + 0x400) // sprites + 3 bg layers
+ MCFG_GFXDECODE(gstream)
- MDRV_VIDEO_START(gstream)
- MDRV_VIDEO_UPDATE(gstream)
+ MCFG_VIDEO_START(gstream)
+ MCFG_VIDEO_UPDATE(gstream)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH) /* 1 Mhz? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH) /* 1 Mhz? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH) /* 1 Mhz? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH) /* 1 Mhz? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
ROM_START( gstream )
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 4ae81b64090..f8cce9e3409 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -547,76 +547,76 @@ INPUT_PORTS_END
/*** MACHINE DRIVER **********************************************************/
static MACHINE_CONFIG_START( gstriker, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(gstriker_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(gstriker_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000) /* hand-tuned, it needs a bit */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000) /* hand-tuned, it needs a bit */)
+ 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)
- MDRV_GFXDECODE(gstriker)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(gstriker)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(gstriker)
- MDRV_VIDEO_UPDATE(gstriker)
+ MCFG_VIDEO_START(gstriker)
+ MCFG_VIDEO_UPDATE(gstriker)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_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_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_DERIVED( twrldc94, gstriker )
- MDRV_VIDEO_START( twrldc94 )
+ MCFG_VIDEO_START( twrldc94 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( vgoal, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(vgoal_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(vgoal_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000) /* hand-tuned, it needs a bit */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000) /* hand-tuned, it needs a bit */)
+ 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)
- MDRV_GFXDECODE(gstriker)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(gstriker)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(vgoalsoc)
- MDRV_VIDEO_UPDATE(gstriker)
+ MCFG_VIDEO_START(vgoalsoc)
+ MCFG_VIDEO_UPDATE(gstriker)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_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_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
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 6966cd9786a..a7a0b9224b6 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -679,103 +679,103 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( gsword, gsword_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_CPU_IO_MAP(cpu1_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_IO_MAP(cpu1_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_18MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_IO_MAP(cpu2_io_map)
- MDRV_CPU_VBLANK_INT_HACK(gsword_snd_interrupt,4)
+ MCFG_CPU_ADD("sub", Z80, XTAL_18MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_IO_MAP(cpu2_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(gsword_snd_interrupt,4)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_18MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu3_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_18MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu3_map)
- MDRV_QUANTUM_TIME(HZ(12000)) /* Allow time for 2nd cpu to interleave*/
+ MCFG_QUANTUM_TIME(HZ(12000)) /* Allow time for 2nd cpu to interleave*/
- MDRV_MACHINE_RESET(gsword)
+ MCFG_MACHINE_RESET(gsword)
#if 1
/* to MCU timeout champbbj */
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
#endif
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(gsword)
- MDRV_PALETTE_LENGTH(64*4+64*4)
+ MCFG_GFXDECODE(gsword)
+ MCFG_PALETTE_LENGTH(64*4+64*4)
- MDRV_PALETTE_INIT(gsword)
- MDRV_VIDEO_START(gsword)
- MDRV_VIDEO_UPDATE(gsword)
+ MCFG_PALETTE_INIT(gsword)
+ MCFG_VIDEO_START(gsword)
+ MCFG_VIDEO_UPDATE(gsword)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_18MHz/12) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_18MHz/12) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( josvolly, gsword_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18000000/6) /* ? */
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_CPU_IO_MAP(josvolly_cpu1_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("maincpu", Z80, 18000000/6) /* ? */
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_IO_MAP(josvolly_cpu1_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_ADD("audiocpu", Z80, 12000000/4) /* ? */
- MDRV_CPU_PROGRAM_MAP(josvolly_cpu2_map)
- MDRV_CPU_IO_MAP(josvolly_cpu2_io_map)
-// MDRV_CPU_VBLANK_INT("screen", gsword_snd_interrupt)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, 12000000/4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(josvolly_cpu2_map)
+ MCFG_CPU_IO_MAP(josvolly_cpu2_io_map)
+// MCFG_CPU_VBLANK_INT("screen", gsword_snd_interrupt)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(josvolly)
+ MCFG_MACHINE_RESET(josvolly)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(gsword)
- MDRV_PALETTE_LENGTH(64*4+64*4)
+ MCFG_GFXDECODE(gsword)
+ MCFG_PALETTE_LENGTH(64*4+64*4)
- MDRV_PALETTE_INIT(josvolly)
- MDRV_VIDEO_START(gsword)
- MDRV_VIDEO_UPDATE(gsword)
+ MCFG_PALETTE_INIT(josvolly)
+ MCFG_VIDEO_START(gsword)
+ MCFG_VIDEO_UPDATE(gsword)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
#if 0
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
#endif
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index 77e772b0f0c..b040489d6e5 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -818,67 +818,67 @@ static MACHINE_RESET( gticlub )
static MACHINE_CONFIG_START( gticlub, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(gticlub_map)
- MDRV_CPU_VBLANK_INT("screen", gticlub_vblank)
+ MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_PROGRAM_MAP(gticlub_map)
+ MCFG_CPU_VBLANK_INT("screen", gticlub_vblank)
- MDRV_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc_map)
+ MCFG_CPU_ADD("dsp", ADSP21062, 36000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(sharc_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_MACHINE_START(gticlub)
- MDRV_MACHINE_RESET(gticlub)
+ MCFG_MACHINE_START(gticlub)
+ MCFG_MACHINE_RESET(gticlub)
- MDRV_ADC1038_ADD("adc1038", gticlub_adc1038_intf)
+ MCFG_ADC1038_ADD("adc1038", gticlub_adc1038_intf)
- MDRV_K056230_ADD("k056230", gticlub_k056230_intf)
+ MCFG_K056230_ADD("k056230", gticlub_k056230_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(512, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(512, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_VIDEO_START(gticlub)
- MDRV_VIDEO_UPDATE(gticlub)
+ MCFG_VIDEO_START(gticlub)
+ MCFG_VIDEO_UPDATE(gticlub)
- MDRV_K001604_ADD("k001604_1", gticlub_k001604_intf)
+ MCFG_K001604_ADD("k001604_1", gticlub_k001604_intf)
- MDRV_K056800_ADD("k056800", gticlub_k056800_interface)
+ MCFG_K056800_ADD("k056800", gticlub_k056800_interface)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("rfsnd", RF5C400, 64000000/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("rfsnd", RF5C400, 64000000/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( thunderh, gticlub )
- MDRV_DEVICE_REMOVE("adc1038")
- MDRV_ADC1038_ADD("adc1038", thunderh_adc1038_intf)
+ MCFG_DEVICE_REMOVE("adc1038")
+ MCFG_ADC1038_ADD("adc1038", thunderh_adc1038_intf)
- MDRV_DEVICE_REMOVE("k056230")
- MDRV_K056230_ADD("k056230", thunderh_k056230_intf)
+ MCFG_DEVICE_REMOVE("k056230")
+ MCFG_K056230_ADD("k056230", thunderh_k056230_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( slrasslt, gticlub )
- MDRV_DEVICE_REMOVE("adc1038")
- MDRV_ADC1038_ADD("adc1038", thunderh_adc1038_intf)
+ MCFG_DEVICE_REMOVE("adc1038")
+ MCFG_ADC1038_ADD("adc1038", thunderh_adc1038_intf)
- MDRV_DEVICE_REMOVE("k001604_1")
- MDRV_K001604_ADD("k001604_1", slrasslt_k001604_intf)
+ MCFG_DEVICE_REMOVE("k001604_1")
+ MCFG_K001604_ADD("k001604_1", slrasslt_k001604_intf)
MACHINE_CONFIG_END
@@ -901,72 +901,72 @@ static MACHINE_RESET( hangplt )
static MACHINE_CONFIG_START( hangplt, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(gticlub_map)
+ MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_PROGRAM_MAP(gticlub_map)
- MDRV_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(hangplt_sharc0_map)
+ MCFG_CPU_ADD("dsp", ADSP21062, 36000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(hangplt_sharc0_map)
- MDRV_CPU_ADD("dsp2", ADSP21062, 36000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(hangplt_sharc1_map)
+ MCFG_CPU_ADD("dsp2", ADSP21062, 36000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(hangplt_sharc1_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_MACHINE_START(gticlub)
- MDRV_MACHINE_RESET(hangplt)
+ MCFG_MACHINE_START(gticlub)
+ MCFG_MACHINE_RESET(hangplt)
- MDRV_ADC1038_ADD("adc1038", thunderh_adc1038_intf)
- MDRV_K056230_ADD("k056230", gticlub_k056230_intf)
+ MCFG_ADC1038_ADD("adc1038", thunderh_adc1038_intf)
+ MCFG_K056230_ADD("k056230", gticlub_k056230_intf)
- MDRV_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "lscreen")
- MDRV_3DFX_VOODOO_CPU("dsp")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 2)
- MDRV_3DFX_VOODOO_TMU_MEMORY(1, 2)
- MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
+ MCFG_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "lscreen")
+ MCFG_3DFX_VOODOO_CPU("dsp")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 2)
+ MCFG_3DFX_VOODOO_TMU_MEMORY(1, 2)
+ MCFG_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
- MDRV_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, 2, "rscreen")
- MDRV_3DFX_VOODOO_CPU("dsp2")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 2)
- MDRV_3DFX_VOODOO_TMU_MEMORY(1, 2)
- MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_1)
+ MCFG_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, 2, "rscreen")
+ MCFG_3DFX_VOODOO_CPU("dsp2")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 2)
+ MCFG_3DFX_VOODOO_TMU_MEMORY(1, 2)
+ MCFG_3DFX_VOODOO_VBLANK(voodoo_vblank_1)
- MDRV_K033906_ADD("k033906_1", hangplt_k033906_intf_0)
- MDRV_K033906_ADD("k033906_2", hangplt_k033906_intf_1)
+ MCFG_K033906_ADD("k033906_1", hangplt_k033906_intf_0)
+ MCFG_K033906_ADD("k033906_2", hangplt_k033906_intf_1)
/* video hardware */
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(512, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(512, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(512, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(512, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
- MDRV_VIDEO_UPDATE(hangplt)
+ MCFG_VIDEO_UPDATE(hangplt)
- MDRV_K001604_ADD("k001604_1", hangplt_k001604_intf_l)
- MDRV_K001604_ADD("k001604_2", hangplt_k001604_intf_r)
+ MCFG_K001604_ADD("k001604_1", hangplt_k001604_intf_l)
+ MCFG_K001604_ADD("k001604_2", hangplt_k001604_intf_r)
- MDRV_K056800_ADD("k056800", gticlub_k056800_interface)
+ MCFG_K056800_ADD("k056800", gticlub_k056800_interface)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("rfsnd", RF5C400, 64000000/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("rfsnd", RF5C400, 64000000/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/*************************************************************************/
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 028f4588fe2..be08b4ce0d5 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -762,33 +762,33 @@ static MACHINE_RESET( guab )
static MACHINE_CONFIG_START( guab, driver_device )
/* TODO: Verify clock */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(guab_map)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(guab_map)
- MDRV_MACHINE_START(guab)
- MDRV_MACHINE_RESET(guab)
+ MCFG_MACHINE_START(guab)
+ MCFG_MACHINE_RESET(guab)
/* TODO: Use real video timings */
- 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, 64*8-1, 0, 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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(guab)
- MDRV_VIDEO_UPDATE(guab)
+ MCFG_VIDEO_START(guab)
+ MCFG_VIDEO_UPDATE(guab)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* TODO: Verify clock */
- MDRV_SOUND_ADD("snsnd", SN76489, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("snsnd", SN76489, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* 6840 PTM */
- MDRV_PTM6840_ADD("6840ptm", ptm_intf)
+ MCFG_PTM6840_ADD("6840ptm", ptm_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index 80dd25d3f42..8ad13095ca4 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -229,41 +229,41 @@ GFXDECODE_END
static MACHINE_CONFIG_START( gumbo, gumbo_state )
- MDRV_CPU_ADD("maincpu", M68000, 14318180 /2) // or 10mhz? ?
- MDRV_CPU_PROGRAM_MAP(gumbo_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) // all the same
+ MCFG_CPU_ADD("maincpu", M68000, 14318180 /2) // or 10mhz? ?
+ MCFG_CPU_PROGRAM_MAP(gumbo_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold) // all the same
- MDRV_GFXDECODE(gumbo)
+ MCFG_GFXDECODE(gumbo)
- 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(8*8, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(gumbo)
- MDRV_VIDEO_UPDATE(gumbo)
+ MCFG_VIDEO_START(gumbo)
+ MCFG_VIDEO_UPDATE(gumbo)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mspuzzle, gumbo )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mspuzzle_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mspuzzle_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dblpoint, gumbo )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dblpoint_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dblpoint_map)
MACHINE_CONFIG_END
ROM_START( gumbo )
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 3f267e5647f..555d8a3d41c 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -345,30 +345,30 @@ static const tc0480scp_interface gunbustr_tc0480scp_intf =
static MACHINE_CONFIG_START( gunbustr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(gunbustr_map)
- MDRV_CPU_VBLANK_INT("screen", gunbustr_interrupt) /* VBL */
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(gunbustr_map)
+ MCFG_CPU_VBLANK_INT("screen", gunbustr_interrupt) /* VBL */
- MDRV_EEPROM_ADD("eeprom", gunbustr_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", gunbustr_eeprom_interface)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(gunbustr)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(gunbustr)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(gunbustr)
- MDRV_VIDEO_UPDATE(gunbustr)
+ MCFG_VIDEO_START(gunbustr)
+ MCFG_VIDEO_UPDATE(gunbustr)
- MDRV_TC0480SCP_ADD("tc0480scp", gunbustr_tc0480scp_intf)
+ MCFG_TC0480SCP_ADD("tc0480scp", gunbustr_tc0480scp_intf)
/* sound hardware */
- MDRV_FRAGMENT_ADD(taito_f3_sound)
+ MCFG_FRAGMENT_ADD(taito_f3_sound)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index 082de627920..6f7d0034195 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -469,33 +469,33 @@ static MACHINE_RESET( gundealr )
static MACHINE_CONFIG_START( gundealr, gundealr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT_HACK(yamyam_interrupt,4) /* ? */
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* 8 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(yamyam_interrupt,4) /* ? */
- MDRV_MACHINE_START(gundealr)
- MDRV_MACHINE_RESET(gundealr)
+ MCFG_MACHINE_START(gundealr)
+ MCFG_MACHINE_RESET(gundealr)
/* 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)
+ 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)
- MDRV_GFXDECODE(gundealr)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(gundealr)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(gundealr)
- MDRV_VIDEO_UPDATE(gundealr)
+ MCFG_VIDEO_START(gundealr)
+ MCFG_VIDEO_UPDATE(gundealr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c
index 479e2d11725..a34959273e0 100644
--- a/src/mame/drivers/gunpey.c
+++ b/src/mame/drivers/gunpey.c
@@ -316,35 +316,35 @@ static INTERRUPT_GEN( gunpey_interrupt )
static MACHINE_CONFIG_START( gunpey, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30, 57242400 / 4)
- MDRV_CPU_PROGRAM_MAP(mem_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", gunpey_interrupt)
+ MCFG_CPU_ADD("maincpu", V30, 57242400 / 4)
+ MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", gunpey_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1)
- MDRV_PALETTE_LENGTH(0x800)
- MDRV_PALETTE_INIT(gunpey)
+ MCFG_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_INIT(gunpey)
- MDRV_VIDEO_START(gunpey)
- MDRV_VIDEO_UPDATE(gunpey)
+ MCFG_VIDEO_START(gunpey)
+ MCFG_VIDEO_UPDATE(gunpey)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MDRV_OKIM6295_ADD("oki", XTAL_16_9344MHz / 8 / 165, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_OKIM6295_ADD("oki", XTAL_16_9344MHz / 8 / 165, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index b982ece9163..c71754c6398 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -298,46 +298,46 @@ static MACHINE_RESET( gunsmoke )
static MACHINE_CONFIG_START( gunsmoke, gunsmoke_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) // 4 MHz
- MDRV_CPU_PROGRAM_MAP(gunsmoke_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) // 4 MHz
+ MCFG_CPU_PROGRAM_MAP(gunsmoke_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
- MDRV_MACHINE_START(gunsmoke)
- MDRV_MACHINE_RESET(gunsmoke)
+ MCFG_MACHINE_START(gunsmoke)
+ MCFG_MACHINE_RESET(gunsmoke)
/* 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)
+ 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)
- MDRV_GFXDECODE(gunsmoke)
- MDRV_PALETTE_LENGTH(32*4+16*16+16*16)
+ MCFG_GFXDECODE(gunsmoke)
+ MCFG_PALETTE_LENGTH(32*4+16*16+16*16)
- MDRV_PALETTE_INIT(gunsmoke)
- MDRV_VIDEO_START(gunsmoke)
- MDRV_VIDEO_UPDATE(gunsmoke)
+ MCFG_PALETTE_INIT(gunsmoke)
+ MCFG_VIDEO_START(gunsmoke)
+ MCFG_VIDEO_UPDATE(gunsmoke)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.22)
- MDRV_SOUND_ROUTE(1, "mono", 0.22)
- MDRV_SOUND_ROUTE(2, "mono", 0.22)
- MDRV_SOUND_ROUTE(3, "mono", 0.14)
-
- MDRV_SOUND_ADD("ym2", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.22)
- MDRV_SOUND_ROUTE(1, "mono", 0.22)
- MDRV_SOUND_ROUTE(2, "mono", 0.22)
- MDRV_SOUND_ROUTE(3, "mono", 0.14)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.22)
+ MCFG_SOUND_ROUTE(1, "mono", 0.22)
+ MCFG_SOUND_ROUTE(2, "mono", 0.22)
+ MCFG_SOUND_ROUTE(3, "mono", 0.14)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.22)
+ MCFG_SOUND_ROUTE(1, "mono", 0.22)
+ MCFG_SOUND_ROUTE(2, "mono", 0.22)
+ MCFG_SOUND_ROUTE(3, "mono", 0.14)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 8b181f8353a..0816f863346 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -508,78 +508,78 @@ static MACHINE_START( gyruss )
static MACHINE_CONFIG_START( gyruss, gyruss_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(main_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("sub", M6809, 2000000) /* 2 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", M6809, 2000000) /* 2 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_cpu1_map)
- MDRV_CPU_IO_MAP(audio_cpu1_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(audio_cpu1_map)
+ MCFG_CPU_IO_MAP(audio_cpu1_io_map)
- MDRV_CPU_ADD("audio2", I8039,8000000) /* 8MHz crystal */
- MDRV_CPU_PROGRAM_MAP(audio_cpu2_map)
- MDRV_CPU_IO_MAP(audio_cpu2_io_map)
+ MCFG_CPU_ADD("audio2", I8039,8000000) /* 8MHz crystal */
+ MCFG_CPU_PROGRAM_MAP(audio_cpu2_map)
+ MCFG_CPU_IO_MAP(audio_cpu2_io_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(gyruss)
+ MCFG_MACHINE_START(gyruss)
/* 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)
+ 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)
- MDRV_GFXDECODE(gyruss)
- MDRV_PALETTE_LENGTH(16*4+16*16)
+ MCFG_GFXDECODE(gyruss)
+ MCFG_PALETTE_LENGTH(16*4+16*16)
- MDRV_PALETTE_INIT(gyruss)
- MDRV_VIDEO_START(gyruss)
- MDRV_VIDEO_UPDATE(gyruss)
+ MCFG_PALETTE_INIT(gyruss)
+ MCFG_VIDEO_START(gyruss)
+ MCFG_VIDEO_UPDATE(gyruss)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
- MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 1)
- MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 2)
-
- MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 3)
- MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 4)
- MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 5)
-
- MDRV_SOUND_ADD("ay3", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_3)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 6)
- MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 7)
- MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 8)
-
- MDRV_SOUND_ADD("ay4", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_4)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 9)
- MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 10)
- MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 11)
-
- MDRV_SOUND_ADD("ay5", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_5)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 12)
- MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 13)
- MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 14)
-
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(gyruss_sound)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
+ MCFG_SOUND_ROUTE_EX(1, "discrete", 1.0, 1)
+ MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 2)
+
+ MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 3)
+ MCFG_SOUND_ROUTE_EX(1, "discrete", 1.0, 4)
+ MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 5)
+
+ MCFG_SOUND_ADD("ay3", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_3)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 6)
+ MCFG_SOUND_ROUTE_EX(1, "discrete", 1.0, 7)
+ MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 8)
+
+ MCFG_SOUND_ADD("ay4", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_4)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 9)
+ MCFG_SOUND_ROUTE_EX(1, "discrete", 1.0, 10)
+ MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 11)
+
+ MCFG_SOUND_ADD("ay5", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_5)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 12)
+ MCFG_SOUND_ROUTE_EX(1, "discrete", 1.0, 13)
+ MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 14)
+
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(gyruss_sound)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 5ec017e809d..13f7558a1bb 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1934,54 +1934,54 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( halleys, driver_device )
- MDRV_CPU_ADD("maincpu", M6809, XTAL_19_968MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(halleys_map)
- MDRV_CPU_VBLANK_INT_HACK(halleys_interrupt, 4)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_19_968MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(halleys_map)
+ MCFG_CPU_VBLANK_INT_HACK(halleys_interrupt, 4)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16))
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16))
- MDRV_MACHINE_RESET(halleys)
+ MCFG_MACHINE_RESET(halleys)
// video hardware
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.50) /* verified on PCB */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(SCREEN_WIDTH, SCREEN_HEIGHT)
- MDRV_SCREEN_VISIBLE_AREA(VIS_MINX, VIS_MAXX, VIS_MINY, VIS_MAXY)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.50) /* verified on PCB */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(SCREEN_WIDTH, SCREEN_HEIGHT)
+ MCFG_SCREEN_VISIBLE_AREA(VIS_MINX, VIS_MAXX, VIS_MINY, VIS_MAXY)
- MDRV_PALETTE_LENGTH(PALETTE_SIZE)
- MDRV_PALETTE_INIT(halleys)
+ MCFG_PALETTE_LENGTH(PALETTE_SIZE)
+ MCFG_PALETTE_INIT(halleys)
- MDRV_VIDEO_START(halleys)
- MDRV_VIDEO_UPDATE(halleys)
+ MCFG_VIDEO_START(halleys)
+ MCFG_VIDEO_UPDATE(halleys)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay3", AY8910, XTAL_6MHz/4) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay4", AY8910, XTAL_6MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay4", AY8910, XTAL_6MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( benberob, halleys )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(XTAL_19_968MHz/12) /* not verified but pcb identical to halley's comet */
- MDRV_CPU_VBLANK_INT_HACK(benberob_interrupt, 4)
- MDRV_VIDEO_UPDATE(benberob)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(XTAL_19_968MHz/12) /* not verified but pcb identical to halley's comet */
+ MCFG_CPU_VBLANK_INT_HACK(benberob_interrupt, 4)
+ MCFG_VIDEO_UPDATE(benberob)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 4e896a23d75..63bd8bdf643 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -201,35 +201,35 @@ static MACHINE_RESET( hanaawas )
static MACHINE_CONFIG_START( hanaawas, hanaawas_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(hanaawas_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(hanaawas_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(hanaawas)
- MDRV_MACHINE_RESET(hanaawas)
+ MCFG_MACHINE_START(hanaawas)
+ MCFG_MACHINE_RESET(hanaawas)
/* 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(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(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(hanaawas)
- MDRV_PALETTE_LENGTH(32*8)
+ MCFG_GFXDECODE(hanaawas)
+ MCFG_PALETTE_LENGTH(32*8)
- MDRV_PALETTE_INIT(hanaawas)
- MDRV_VIDEO_START(hanaawas)
- MDRV_VIDEO_UPDATE(hanaawas)
+ MCFG_PALETTE_INIT(hanaawas)
+ MCFG_VIDEO_START(hanaawas)
+ MCFG_VIDEO_UPDATE(hanaawas)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 18432000/12)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 18432000/12)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 30e1e6aa5af..56aba7e0193 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -1114,33 +1114,33 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( driver_nomsp, harddriv_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68010, 32000000/4)
- MDRV_CPU_PROGRAM_MAP(driver_68k_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_CPU_PERIODIC_INT(hd68k_irq_gen, (double)32000000/16/16/16/16/2)
+ MCFG_CPU_ADD("maincpu", M68010, 32000000/4)
+ MCFG_CPU_PROGRAM_MAP(driver_68k_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_PERIODIC_INT(hd68k_irq_gen, (double)32000000/16/16/16/16/2)
- MDRV_CPU_ADD("gsp", TMS34010, 48000000)
- MDRV_CPU_PROGRAM_MAP(driver_gsp_map)
- MDRV_CPU_CONFIG(gsp_config_driver)
+ MCFG_CPU_ADD("gsp", TMS34010, 48000000)
+ MCFG_CPU_PROGRAM_MAP(driver_gsp_map)
+ MCFG_CPU_CONFIG(gsp_config_driver)
- MDRV_QUANTUM_TIME(HZ(30000))
+ MCFG_QUANTUM_TIME(HZ(30000))
- MDRV_MACHINE_START(harddriv)
- MDRV_MACHINE_RESET(harddriv)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(harddriv)
+ MCFG_MACHINE_RESET(harddriv)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
- MDRV_TIMER_ADD("duart_timer", hd68k_duart_callback)
+ MCFG_TIMER_ADD("duart_timer", hd68k_duart_callback)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(4000000*4, 160*4, 0, 127*4, 417, 0, 384)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(4000000*4, 160*4, 0, 127*4, 417, 0, 384)
- MDRV_VIDEO_START(harddriv)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(harddriv)
+ MCFG_VIDEO_UPDATE(tms340x0)
MACHINE_CONFIG_END
@@ -1148,9 +1148,9 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( driver_msp, driver_nomsp )
/* basic machine hardware */
- MDRV_CPU_ADD("msp", TMS34010, 50000000)
- MDRV_CPU_PROGRAM_MAP(driver_msp_map)
- MDRV_CPU_CONFIG(msp_config)
+ MCFG_CPU_ADD("msp", TMS34010, 50000000)
+ MCFG_CPU_PROGRAM_MAP(driver_msp_map)
+ MCFG_CPU_CONFIG(msp_config)
MACHINE_CONFIG_END
@@ -1158,16 +1158,16 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( multisync_nomsp, driver_nomsp )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(multisync_68k_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(multisync_68k_map)
- MDRV_CPU_MODIFY("gsp")
- MDRV_CPU_CONFIG(gsp_config_multisync)
- MDRV_CPU_PROGRAM_MAP(multisync_gsp_map)
+ MCFG_CPU_MODIFY("gsp")
+ MCFG_CPU_CONFIG(gsp_config_multisync)
+ MCFG_CPU_PROGRAM_MAP(multisync_gsp_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(6000000*2, 323*2, 0, 256*2, 308, 0, 288)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(6000000*2, 323*2, 0, 256*2, 308, 0, 288)
MACHINE_CONFIG_END
@@ -1175,9 +1175,9 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( multisync_msp, multisync_nomsp )
/* basic machine hardware */
- MDRV_CPU_ADD("msp", TMS34010, 50000000)
- MDRV_CPU_PROGRAM_MAP(driver_msp_map)
- MDRV_CPU_CONFIG(msp_config)
+ MCFG_CPU_ADD("msp", TMS34010, 50000000)
+ MCFG_CPU_PROGRAM_MAP(driver_msp_map)
+ MCFG_CPU_CONFIG(msp_config)
MACHINE_CONFIG_END
@@ -1185,11 +1185,11 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( multisync2, multisync_nomsp )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(multisync2_68k_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(multisync2_68k_map)
- MDRV_CPU_MODIFY("gsp")
- MDRV_CPU_PROGRAM_MAP(multisync2_gsp_map)
+ MCFG_CPU_MODIFY("gsp")
+ MCFG_CPU_PROGRAM_MAP(multisync2_gsp_map)
MACHINE_CONFIG_END
@@ -1204,9 +1204,9 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( adsp )
/* basic machine hardware */
- MDRV_CPU_ADD("adsp", ADSP2100, 8000000)
- MDRV_CPU_PROGRAM_MAP(adsp_program_map)
- MDRV_CPU_DATA_MAP(adsp_data_map)
+ MCFG_CPU_ADD("adsp", ADSP2100, 8000000)
+ MCFG_CPU_PROGRAM_MAP(adsp_program_map)
+ MCFG_CPU_DATA_MAP(adsp_data_map)
MACHINE_CONFIG_END
@@ -1214,11 +1214,11 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( ds3 )
/* basic machine hardware */
- MDRV_CPU_ADD("adsp", ADSP2101, 12000000)
- MDRV_CPU_PROGRAM_MAP(ds3_program_map)
- MDRV_CPU_DATA_MAP(ds3_data_map)
+ MCFG_CPU_ADD("adsp", ADSP2101, 12000000)
+ MCFG_CPU_PROGRAM_MAP(ds3_program_map)
+ MCFG_CPU_DATA_MAP(ds3_data_map)
- MDRV_QUANTUM_TIME(HZ(60000))
+ MCFG_QUANTUM_TIME(HZ(60000))
MACHINE_CONFIG_END
@@ -1226,23 +1226,23 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( ds4 )
/* basic machine hardware */
- MDRV_CPU_ADD("adsp", ADSP2101, 12000000)
- MDRV_CPU_PROGRAM_MAP(ds3_program_map)
- MDRV_CPU_DATA_MAP(ds3_data_map)
+ MCFG_CPU_ADD("adsp", ADSP2101, 12000000)
+ MCFG_CPU_PROGRAM_MAP(ds3_program_map)
+ MCFG_CPU_DATA_MAP(ds3_data_map)
-// MDRV_CPU_ADD("ds4cpu1", ADSP2105, 10000000)
-// MDRV_CPU_PROGRAM_MAP(ds3snd_program_map)
+// MCFG_CPU_ADD("ds4cpu1", ADSP2105, 10000000)
+// MCFG_CPU_PROGRAM_MAP(ds3snd_program_map)
-// MDRV_CPU_ADD("ds4cpu2", ADSP2105, 10000000)
-// MDRV_CPU_PROGRAM_MAP(ds3snd_program_map)
+// MCFG_CPU_ADD("ds4cpu2", ADSP2105, 10000000)
+// MCFG_CPU_PROGRAM_MAP(ds3snd_program_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1257,12 +1257,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( dsk )
/* basic machine hardware */
- MDRV_CPU_ADD("dsp32", DSP32C, 40000000)
- MDRV_CPU_CONFIG(dsp32c_config)
- MDRV_CPU_PROGRAM_MAP(dsk_dsp32_map)
+ MCFG_CPU_ADD("dsp32", DSP32C, 40000000)
+ MCFG_CPU_CONFIG(dsp32c_config)
+ MCFG_CPU_PROGRAM_MAP(dsk_dsp32_map)
/* ASIC65 */
- MDRV_FRAGMENT_ADD( asic65 )
+ MCFG_FRAGMENT_ADD( asic65 )
MACHINE_CONFIG_END
@@ -1270,12 +1270,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( dsk2 )
/* basic machine hardware */
- MDRV_CPU_ADD("dsp32", DSP32C, 40000000)
- MDRV_CPU_CONFIG(dsp32c_config)
- MDRV_CPU_PROGRAM_MAP(dsk2_dsp32_map)
+ MCFG_CPU_ADD("dsp32", DSP32C, 40000000)
+ MCFG_CPU_CONFIG(dsp32c_config)
+ MCFG_CPU_PROGRAM_MAP(dsk2_dsp32_map)
/* ASIC65 */
- MDRV_FRAGMENT_ADD( asic65 )
+ MCFG_FRAGMENT_ADD( asic65 )
MACHINE_CONFIG_END
@@ -1289,19 +1289,19 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( driversnd )
/* basic machine hardware */
- MDRV_CPU_ADD("soundcpu", M68000, 16000000/2)
- MDRV_CPU_PROGRAM_MAP(driversnd_68k_map)
+ MCFG_CPU_ADD("soundcpu", M68000, 16000000/2)
+ MCFG_CPU_PROGRAM_MAP(driversnd_68k_map)
- MDRV_CPU_ADD("sounddsp", TMS32010, 20000000)
- MDRV_CPU_PROGRAM_MAP(driversnd_dsp_program_map)
+ MCFG_CPU_ADD("sounddsp", TMS32010, 20000000)
+ MCFG_CPU_PROGRAM_MAP(driversnd_dsp_program_map)
/* Data Map is internal to the CPU */
- MDRV_CPU_IO_MAP(driversnd_dsp_io_map)
+ MCFG_CPU_IO_MAP(driversnd_dsp_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", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1315,73 +1315,73 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( harddriv, driver_msp )
/* basic machine hardware */ /* original driver board with MSP */
- MDRV_FRAGMENT_ADD( adsp ) /* ADSP board */
- MDRV_FRAGMENT_ADD( driversnd ) /* driver sound board */
+ MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
+ MCFG_FRAGMENT_ADD( driversnd ) /* driver sound board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( harddrivc, multisync_msp )
/* basic machine hardware */ /* multisync board with MSP */
- MDRV_FRAGMENT_ADD( adsp ) /* ADSP board */
- MDRV_FRAGMENT_ADD( driversnd ) /* driver sound board */
+ MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
+ MCFG_FRAGMENT_ADD( driversnd ) /* driver sound board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( racedriv, driver_nomsp )
/* basic machine hardware */ /* original driver board without MSP */
- MDRV_FRAGMENT_ADD( adsp ) /* ADSP board */
- MDRV_FRAGMENT_ADD( dsk ) /* DSK board */
- MDRV_FRAGMENT_ADD( driversnd ) /* driver sound board */
+ MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
+ MCFG_FRAGMENT_ADD( dsk ) /* DSK board */
+ MCFG_FRAGMENT_ADD( driversnd ) /* driver sound board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( racedrivc, multisync_nomsp )
/* basic machine hardware */ /* multisync board without MSP */
- MDRV_FRAGMENT_ADD( adsp ) /* ADSP board */
- MDRV_FRAGMENT_ADD( dsk ) /* DSK board */
- MDRV_FRAGMENT_ADD( driversnd ) /* driver sound board */
+ MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
+ MCFG_FRAGMENT_ADD( dsk ) /* DSK board */
+ MCFG_FRAGMENT_ADD( driversnd ) /* driver sound board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( stunrun, multisync_nomsp )
/* basic machine hardware */ /* multisync board without MSP */
- MDRV_CPU_MODIFY("gsp")
- MDRV_CPU_CONFIG(gsp_config_multisync_stunrun)
- MDRV_FRAGMENT_ADD( adsp ) /* ADSP board */
- MDRV_FRAGMENT_ADD( jsa_ii_mono ) /* JSA II sound board */
+ MCFG_CPU_MODIFY("gsp")
+ MCFG_CPU_CONFIG(gsp_config_multisync_stunrun)
+ MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
+ MCFG_FRAGMENT_ADD( jsa_ii_mono ) /* JSA II sound board */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(5000000*2, 317*2, 0, 256*2, 262, 0, 228)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(5000000*2, 317*2, 0, 256*2, 262, 0, 228)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( strtdriv, multisync_nomsp )
/* basic machine hardware */ /* multisync board */
- MDRV_FRAGMENT_ADD( ds3 ) /* DS III board */
- MDRV_FRAGMENT_ADD( dsk ) /* DSK board */
+ MCFG_FRAGMENT_ADD( ds3 ) /* DS III board */
+ MCFG_FRAGMENT_ADD( dsk ) /* DSK board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( steeltal, multisync_msp )
/* basic machine hardware */ /* multisync board with MSP */
- MDRV_FRAGMENT_ADD( ds3 ) /* DS III board */
- MDRV_FRAGMENT_ADD( jsa_iii_mono ) /* JSA III sound board */
- MDRV_FRAGMENT_ADD( asic65 ) /* ASIC65 on DSPCOM board */
+ MCFG_FRAGMENT_ADD( ds3 ) /* DS III board */
+ MCFG_FRAGMENT_ADD( jsa_iii_mono ) /* JSA III sound board */
+ MCFG_FRAGMENT_ADD( asic65 ) /* ASIC65 on DSPCOM board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hdrivair, multisync2 )
/* basic machine hardware */ /* multisync II board */
- MDRV_FRAGMENT_ADD( ds4 ) /* DS IV board */
- MDRV_FRAGMENT_ADD( dsk2 ) /* DSK II board */
+ MCFG_FRAGMENT_ADD( ds4 ) /* DS IV board */
+ MCFG_FRAGMENT_ADD( dsk2 ) /* DSK II board */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 5dad6bc5b67..6895783b287 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -208,50 +208,50 @@ static MACHINE_RESET( hcastle )
static MACHINE_CONFIG_START( hcastle, hcastle_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* Derived from 24 MHz clock */
- MDRV_CPU_PROGRAM_MAP(hcastle_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* Derived from 24 MHz clock */
+ MCFG_CPU_PROGRAM_MAP(hcastle_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- 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(hcastle)
- MDRV_MACHINE_RESET(hcastle)
+ MCFG_MACHINE_START(hcastle)
+ MCFG_MACHINE_RESET(hcastle)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second verified by comparison with real board */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second verified by comparison with real board */)
+ 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)
- MDRV_GFXDECODE(hcastle)
- MDRV_PALETTE_LENGTH(2*8*16*16)
+ MCFG_GFXDECODE(hcastle)
+ MCFG_PALETTE_LENGTH(2*8*16*16)
- MDRV_PALETTE_INIT(hcastle)
- MDRV_VIDEO_START(hcastle)
- MDRV_VIDEO_UPDATE(hcastle)
+ MCFG_PALETTE_INIT(hcastle)
+ MCFG_VIDEO_START(hcastle)
+ MCFG_VIDEO_UPDATE(hcastle)
- MDRV_K007121_ADD("k007121_1")
- MDRV_K007121_ADD("k007121_2")
+ MCFG_K007121_ADD("k007121_1")
+ MCFG_K007121_ADD("k007121_2")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("konami1", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.44)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("konami1", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.44)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("konami2", K051649, 3579545/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("konami2", K051649, 3579545/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index c9315e24fd8..857efeb8587 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -221,33 +221,33 @@ static INTERRUPT_GEN( hexion_interrupt )
static MACHINE_CONFIG_START( hexion, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,24000000/4) /* Z80B 6 MHz */
- MDRV_CPU_PROGRAM_MAP(hexion_map)
- MDRV_CPU_VBLANK_INT_HACK(hexion_interrupt,3) /* both IRQ and NMI are used */
+ MCFG_CPU_ADD("maincpu", Z80,24000000/4) /* Z80B 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(hexion_map)
+ MCFG_CPU_VBLANK_INT_HACK(hexion_interrupt,3) /* both IRQ and NMI are used */
/* 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, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(hexion)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(hexion)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(hexion)
- MDRV_VIDEO_UPDATE(hexion)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(hexion)
+ MCFG_VIDEO_UPDATE(hexion)
/* 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)
- MDRV_SOUND_ADD("konami", K051649, 24000000/16)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("konami", K051649, 24000000/16)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index 43895db6ca5..284c451485c 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -158,33 +158,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( higemaru, higemaru_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz Sharp LH0080A Z80A-CPU-D */
- MDRV_CPU_PROGRAM_MAP(higemaru_map)
- MDRV_CPU_VBLANK_INT_HACK(higemaru_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz Sharp LH0080A Z80A-CPU-D */
+ MCFG_CPU_PROGRAM_MAP(higemaru_map)
+ MCFG_CPU_VBLANK_INT_HACK(higemaru_interrupt,2)
/* 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)
+ 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)
- MDRV_GFXDECODE(higemaru)
- MDRV_PALETTE_LENGTH(32*4+16*16)
+ MCFG_GFXDECODE(higemaru)
+ MCFG_PALETTE_LENGTH(32*4+16*16)
- MDRV_PALETTE_INIT(higemaru)
- MDRV_VIDEO_START(higemaru)
- MDRV_VIDEO_UPDATE(higemaru)
+ MCFG_PALETTE_INIT(higemaru)
+ MCFG_VIDEO_START(higemaru)
+ MCFG_VIDEO_UPDATE(higemaru)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c
index faca3954ffb..d7f5dd321ec 100644
--- a/src/mame/drivers/highvdeo.c
+++ b/src/mame/drivers/highvdeo.c
@@ -867,97 +867,97 @@ static INTERRUPT_GEN( vblank_irq )
}
static MACHINE_CONFIG_START( tv_vcf, driver_device )
- MDRV_CPU_ADD("maincpu", V30, XTAL_12MHz/2 ) // ?
- MDRV_CPU_PROGRAM_MAP(tv_vcf_map)
- MDRV_CPU_IO_MAP(tv_vcf_io)
- MDRV_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_ADD("maincpu", V30, XTAL_12MHz/2 ) // ?
+ MCFG_CPU_PROGRAM_MAP(tv_vcf_map)
+ MCFG_CPU_IO_MAP(tv_vcf_io)
+ MCFG_CPU_VBLANK_INT("screen", vblank_irq)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
+ 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(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(tourvisn)
- MDRV_VIDEO_UPDATE(tourvisn)
+ MCFG_VIDEO_START(tourvisn)
+ MCFG_VIDEO_UPDATE(tourvisn)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
//OkiM6376
- MDRV_SOUND_ADD("oki", OKIM6376, XTAL_12MHz/2/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("oki", OKIM6376, XTAL_12MHz/2/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tv_ncf, tv_vcf )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tv_ncf_map)
- MDRV_CPU_IO_MAP(tv_ncf_io)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tv_ncf_map)
+ MCFG_CPU_IO_MAP(tv_ncf_io)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tv_tcf, tv_vcf )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tv_tcf_map)
- MDRV_CPU_IO_MAP(tv_tcf_io)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tv_tcf_map)
+ MCFG_CPU_IO_MAP(tv_tcf_io)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( newmcard, tv_tcf )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(newmcard_map)
- MDRV_CPU_IO_MAP(newmcard_io)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(newmcard_map)
+ MCFG_CPU_IO_MAP(newmcard_io)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ciclone, tv_tcf )
- MDRV_DEVICE_REMOVE("maincpu")
+ MCFG_DEVICE_REMOVE("maincpu")
- MDRV_CPU_ADD("maincpu", I80186, 20000000/2 ) // ?
- MDRV_CPU_PROGRAM_MAP(tv_tcf_map)
- MDRV_CPU_IO_MAP(tv_tcf_io)
- MDRV_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_ADD("maincpu", I80186, 20000000/2 ) // ?
+ MCFG_CPU_PROGRAM_MAP(tv_tcf_map)
+ MCFG_CPU_IO_MAP(tv_tcf_io)
+ MCFG_CPU_VBLANK_INT("screen", vblank_irq)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( brasil, driver_device )
- MDRV_CPU_ADD("maincpu", I80186, 20000000 ) // fashion doesn't like 20/2 Mhz
- MDRV_CPU_PROGRAM_MAP(brasil_map)
- MDRV_CPU_IO_MAP(brasil_io)
- MDRV_CPU_VBLANK_INT("screen", vblank_irq)
+ MCFG_CPU_ADD("maincpu", I80186, 20000000 ) // fashion doesn't like 20/2 Mhz
+ MCFG_CPU_PROGRAM_MAP(brasil_map)
+ MCFG_CPU_IO_MAP(brasil_io)
+ MCFG_CPU_VBLANK_INT("screen", vblank_irq)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1)
+ 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(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(tourvisn)
- MDRV_VIDEO_UPDATE(brasil)
+ MCFG_VIDEO_START(tourvisn)
+ MCFG_VIDEO_UPDATE(brasil)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("oki", OKIM6376, XTAL_12MHz/2/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("oki", OKIM6376, XTAL_12MHz/2/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( tour4000 )
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index a60e89f6601..8487a1df334 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -374,37 +374,37 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_START( hikaru, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", SH4, CPU_CLOCK)
-// MDRV_CPU_CONFIG(sh4cpu_config)
- MDRV_CPU_PROGRAM_MAP(hikaru_map)
-// MDRV_CPU_IO_MAP(hikaru_port)
-// MDRV_CPU_VBLANK_INT("screen", hikaru,vblank)
- MDRV_CPU_ADD("slave", SH4, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(hikaru_map_slave)
+ MCFG_CPU_ADD("maincpu", SH4, CPU_CLOCK)
+// MCFG_CPU_CONFIG(sh4cpu_config)
+ MCFG_CPU_PROGRAM_MAP(hikaru_map)
+// MCFG_CPU_IO_MAP(hikaru_port)
+// MCFG_CPU_VBLANK_INT("screen", hikaru,vblank)
+ MCFG_CPU_ADD("slave", SH4, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(hikaru_map_slave)
-// MDRV_MACHINE_START( hikaru )
-// MDRV_MACHINE_RESET( hikaru )
+// MCFG_MACHINE_START( hikaru )
+// MCFG_MACHINE_RESET( hikaru )
-// MDRV_NVRAM_HANDLER(hikaru_eeproms)
+// MCFG_NVRAM_HANDLER(hikaru_eeproms)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
-
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(hikaru)
- MDRV_VIDEO_UPDATE(hikaru)
-
-// MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-// MDRV_SOUND_ADD("aica", AICA, 0)
-// MDRV_SOUND_CONFIG(aica_config)
-// MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
-// MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
+
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(hikaru)
+ MCFG_VIDEO_UPDATE(hikaru)
+
+// MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+// MCFG_SOUND_ADD("aica", AICA, 0)
+// MCFG_SOUND_CONFIG(aica_config)
+// MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+// MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c
index 0a1a3d8f645..4da10fcb212 100644
--- a/src/mame/drivers/himesiki.c
+++ b/src/mame/drivers/himesiki.c
@@ -292,38 +292,38 @@ static MACHINE_RESET( himesiki )
static MACHINE_CONFIG_START( himesiki, himesiki_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
- MDRV_CPU_PROGRAM_MAP(himesiki_prm0)
- MDRV_CPU_IO_MAP(himesiki_iom0)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(himesiki_prm0)
+ MCFG_CPU_IO_MAP(himesiki_iom0)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, MCLK/3) /* 4.000 MHz */
- MDRV_CPU_PROGRAM_MAP(himesiki_prm1)
- MDRV_CPU_IO_MAP(himesiki_iom1)
+ MCFG_CPU_ADD("sub", Z80, MCLK/3) /* 4.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(himesiki_prm1)
+ MCFG_CPU_IO_MAP(himesiki_iom1)
- MDRV_MACHINE_START(himesiki)
- MDRV_MACHINE_RESET(himesiki)
+ MCFG_MACHINE_START(himesiki)
+ MCFG_MACHINE_RESET(himesiki)
/* video hardware */
- 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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
- MDRV_GFXDECODE(himesiki)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(himesiki)
- MDRV_VIDEO_UPDATE(himesiki)
+ 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
+ MCFG_GFXDECODE(himesiki)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_VIDEO_START(himesiki)
+ MCFG_VIDEO_UPDATE(himesiki)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym2203", YM2203, MCLK/4)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ym2203", YM2203, MCLK/4)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 622d24538be..fa86725bc61 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -319,33 +319,33 @@ static MACHINE_RESET( hitme )
static MACHINE_CONFIG_START( hitme, hitme_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK/16)
- MDRV_CPU_PROGRAM_MAP(hitme_map)
- MDRV_CPU_IO_MAP(hitme_portmap)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/16)
+ MCFG_CPU_PROGRAM_MAP(hitme_map)
+ MCFG_CPU_IO_MAP(hitme_portmap)
- MDRV_MACHINE_START(hitme)
- MDRV_MACHINE_RESET(hitme)
+ MCFG_MACHINE_START(hitme)
+ MCFG_MACHINE_RESET(hitme)
/* 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(40*8, 19*10)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 19*10-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(40*8, 19*10)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 19*10-1)
- MDRV_GFXDECODE(hitme)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(hitme)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(hitme)
- MDRV_VIDEO_UPDATE(hitme)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(hitme)
+ MCFG_VIDEO_UPDATE(hitme)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(hitme)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(hitme)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -360,14 +360,14 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( barricad, hitme )
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(32*8, 24*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(32*8, 24*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
- MDRV_GFXDECODE(barricad)
+ MCFG_GFXDECODE(barricad)
- MDRV_VIDEO_START(barricad)
- MDRV_VIDEO_UPDATE(barricad)
+ MCFG_VIDEO_START(barricad)
+ MCFG_VIDEO_UPDATE(barricad)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c
index 5a681aaf405..9bc89d08455 100644
--- a/src/mame/drivers/hitpoker.c
+++ b/src/mame/drivers/hitpoker.c
@@ -462,33 +462,33 @@ static INTERRUPT_GEN( hitpoker_irq )
}
static MACHINE_CONFIG_START( hitpoker, driver_device )
- MDRV_CPU_ADD("maincpu", MC68HC11,1000000)
- MDRV_CPU_PROGRAM_MAP(hitpoker_map)
- MDRV_CPU_IO_MAP(hitpoker_io)
- MDRV_CPU_CONFIG(hitpoker_config)
- MDRV_CPU_VBLANK_INT("screen", hitpoker_irq)
+ MCFG_CPU_ADD("maincpu", MC68HC11,1000000)
+ MCFG_CPU_PROGRAM_MAP(hitpoker_map)
+ MCFG_CPU_IO_MAP(hitpoker_io)
+ MCFG_CPU_CONFIG(hitpoker_config)
+ MCFG_CPU_VBLANK_INT("screen", hitpoker_irq)
/* 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(648, 480) //setted by the CRTC
- MDRV_SCREEN_VISIBLE_AREA(0, 648-1, 0, 240-1)
+ 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(648, 480) //setted by the CRTC
+ MCFG_SCREEN_VISIBLE_AREA(0, 648-1, 0, 240-1)
- MDRV_MC6845_ADD("crtc", H46505, CRTC_CLOCK/2, mc6845_intf) /* hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, CRTC_CLOCK/2, mc6845_intf) /* hand tuned to get ~60 fps */
- MDRV_GFXDECODE(hitpoker)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(hitpoker)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(hitpoker)
- MDRV_VIDEO_UPDATE(hitpoker)
+ MCFG_VIDEO_START(hitpoker)
+ MCFG_VIDEO_UPDATE(hitpoker)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static DRIVER_INIT(hitpoker)
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index badc78276fe..576045b74b3 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -557,57 +557,57 @@ static MACHINE_RESET( hnayayoi )
static MACHINE_CONFIG_START( hnayayoi, hnayayoi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 20000000/4 ) /* 5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(hnayayoi_map)
- MDRV_CPU_IO_MAP(hnayayoi_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8000)
+ MCFG_CPU_ADD("maincpu", Z80, 20000000/4 ) /* 5 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(hnayayoi_map)
+ MCFG_CPU_IO_MAP(hnayayoi_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 8000)
- MDRV_MACHINE_START(hnayayoi)
- MDRV_MACHINE_RESET(hnayayoi)
+ MCFG_MACHINE_START(hnayayoi)
+ MCFG_MACHINE_RESET(hnayayoi)
- 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+ 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, 512-1, 0, 256-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(hnayayoi)
- MDRV_VIDEO_UPDATE(hnayayoi)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(hnayayoi)
+ MCFG_VIDEO_UPDATE(hnayayoi)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, 20000000/8)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
-
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, 20000000/8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
+
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hnfubuki, hnayayoi )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hnfubuki_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hnfubuki_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( untoucha, hnayayoi )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(untoucha_map)
- MDRV_CPU_IO_MAP(untoucha_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(untoucha_map)
+ MCFG_CPU_IO_MAP(untoucha_io_map)
- MDRV_VIDEO_START(untoucha)
+ MCFG_VIDEO_START(untoucha)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index fc9b21930f4..ed26f04a44f 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1718,35 +1718,35 @@ static MACHINE_RESET(hyperneo)
static MACHINE_CONFIG_START( hng64, hng64_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", VR4300BE, MASTER_CLOCK) // actually R4300
- MDRV_CPU_CONFIG(vr4300_config)
- MDRV_CPU_PROGRAM_MAP(hng_map)
- MDRV_CPU_VBLANK_INT_HACK(irq_start,4)
+ MCFG_CPU_ADD("maincpu", VR4300BE, MASTER_CLOCK) // actually R4300
+ MCFG_CPU_CONFIG(vr4300_config)
+ MCFG_CPU_PROGRAM_MAP(hng_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq_start,4)
- MDRV_CPU_ADD("audiocpu", V33, 8000000) // v53, 16? mhz!
- MDRV_CPU_PROGRAM_MAP(hng_sound_map)
+ MCFG_CPU_ADD("audiocpu", V33, 8000000) // v53, 16? mhz!
+ MCFG_CPU_PROGRAM_MAP(hng_sound_map)
- MDRV_CPU_ADD("comm", Z80,MASTER_CLOCK/4) /* KL5C80A12CFP - binary compatible with Z80. */
- MDRV_CPU_PROGRAM_MAP(hng_comm_map)
- MDRV_CPU_IO_MAP(hng_comm_io_map)
+ MCFG_CPU_ADD("comm", Z80,MASTER_CLOCK/4) /* KL5C80A12CFP - binary compatible with Z80. */
+ MCFG_CPU_PROGRAM_MAP(hng_comm_map)
+ MCFG_CPU_IO_MAP(hng_comm_io_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_GFXDECODE(hng64)
- MDRV_MACHINE_START(hyperneo)
- MDRV_MACHINE_RESET(hyperneo)
+ MCFG_GFXDECODE(hng64)
+ MCFG_MACHINE_START(hyperneo)
+ MCFG_MACHINE_RESET(hyperneo)
- 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_RGB32)
- MDRV_SCREEN_SIZE(1024, 1024)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x200-1, 0, 0x1c0-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(1024, 1024)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x200-1, 0, 0x1c0-1)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(hng64)
- MDRV_VIDEO_UPDATE(hng64)
+ MCFG_VIDEO_START(hng64)
+ MCFG_VIDEO_UPDATE(hng64)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 9420339986c..40fe133203f 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -277,36 +277,36 @@ static const ay8910_interface ay8910_interface_2 =
static MACHINE_CONFIG_START( holeland, holeland_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(holeland_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(holeland_map)
+ MCFG_CPU_IO_MAP(io_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(32*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 2*16, 30*16-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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 2*16, 30*16-1)
- MDRV_GFXDECODE(holeland)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(holeland)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(holeland)
- MDRV_VIDEO_UPDATE(holeland)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(holeland)
+ MCFG_VIDEO_UPDATE(holeland)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1818182)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1818182)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1818182)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1818182)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
/*
@@ -346,38 +346,38 @@ Notes:
static MACHINE_CONFIG_START( crzrally, holeland_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 20000000/4) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(crzrally_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5 MHz */
+ MCFG_CPU_PROGRAM_MAP(crzrally_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59)
+ 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)
- MDRV_GFXDECODE(crzrally)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(crzrally)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(crzrally)
- MDRV_VIDEO_UPDATE(crzrally)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(crzrally)
+ MCFG_VIDEO_UPDATE(crzrally)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 20000000/16)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 20000000/16)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 20000000/16)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 20000000/16)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index f7b12060520..79076d28e30 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1255,42 +1255,42 @@ static MACHINE_RESET( reikaids )
static MACHINE_CONFIG_START( mrokumei, homedata_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
- MDRV_CPU_PROGRAM_MAP(mrokumei_map)
- MDRV_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
+ MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
+ MCFG_CPU_PROGRAM_MAP(mrokumei_map)
+ MCFG_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
- MDRV_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4MHz ? */
- MDRV_CPU_PROGRAM_MAP(mrokumei_sound_map)
- MDRV_CPU_IO_MAP(mrokumei_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4MHz ? */
+ MCFG_CPU_PROGRAM_MAP(mrokumei_sound_map)
+ MCFG_CPU_IO_MAP(mrokumei_sound_io_map)
- MDRV_MACHINE_START(homedata)
- MDRV_MACHINE_RESET(homedata)
+ MCFG_MACHINE_START(homedata)
+ MCFG_MACHINE_RESET(homedata)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
// visible area can be changed at runtime
- MDRV_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mrokumei)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(mrokumei)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(mrokumei)
- MDRV_VIDEO_START(mrokumei)
- MDRV_VIDEO_UPDATE(mrokumei)
- MDRV_VIDEO_EOF(homedata)
+ MCFG_PALETTE_INIT(mrokumei)
+ MCFG_VIDEO_START(mrokumei)
+ MCFG_VIDEO_UPDATE(mrokumei)
+ MCFG_VIDEO_EOF(homedata)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually
+ 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
@@ -1321,49 +1321,49 @@ static const UPD7810_CONFIG upd_config =
static MACHINE_CONFIG_START( reikaids, homedata_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
- MDRV_CPU_PROGRAM_MAP(reikaids_map)
- MDRV_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
+ MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
+ MCFG_CPU_PROGRAM_MAP(reikaids_map)
+ MCFG_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
- MDRV_CPU_ADD("audiocpu", UPD7807, 8000000) /* ??? MHz (max speed for the 7807 is 12MHz) */
- MDRV_CPU_CONFIG(upd_config)
- MDRV_CPU_PROGRAM_MAP(reikaids_upd7807_map)
- MDRV_CPU_IO_MAP(reikaids_upd7807_io_map)
- MDRV_CPU_VBLANK_INT("screen", upd7807_irq)
+ MCFG_CPU_ADD("audiocpu", UPD7807, 8000000) /* ??? MHz (max speed for the 7807 is 12MHz) */
+ MCFG_CPU_CONFIG(upd_config)
+ MCFG_CPU_PROGRAM_MAP(reikaids_upd7807_map)
+ MCFG_CPU_IO_MAP(reikaids_upd7807_io_map)
+ MCFG_CPU_VBLANK_INT("screen", upd7807_irq)
- MDRV_QUANTUM_TIME(HZ(30000)) // very high interleave required to sync for startup tests
+ MCFG_QUANTUM_TIME(HZ(30000)) // very high interleave required to sync for startup tests
- MDRV_MACHINE_START(reikaids)
- MDRV_MACHINE_RESET(reikaids)
+ MCFG_MACHINE_START(reikaids)
+ MCFG_MACHINE_RESET(reikaids)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 16, 256-1-16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 256-1-16)
- MDRV_GFXDECODE(reikaids)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(reikaids)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(reikaids)
- MDRV_VIDEO_START(reikaids)
- MDRV_VIDEO_UPDATE(reikaids)
- MDRV_VIDEO_EOF(homedata)
+ MCFG_PALETTE_INIT(reikaids)
+ MCFG_VIDEO_START(reikaids)
+ MCFG_VIDEO_UPDATE(reikaids)
+ MCFG_VIDEO_EOF(homedata)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -1372,60 +1372,60 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pteacher, homedata_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
- MDRV_CPU_PROGRAM_MAP(pteacher_map)
- MDRV_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
+ MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
+ MCFG_CPU_PROGRAM_MAP(pteacher_map)
+ MCFG_CPU_VBLANK_INT("screen", homedata_irq) /* also triggered by the blitter */
- MDRV_CPU_ADD("audiocpu", UPD7807, 9000000) /* 9MHz ? */
- MDRV_CPU_CONFIG(upd_config)
- MDRV_CPU_PROGRAM_MAP(pteacher_upd7807_map)
- MDRV_CPU_IO_MAP(pteacher_upd7807_io_map)
- MDRV_CPU_VBLANK_INT("screen", upd7807_irq)
+ MCFG_CPU_ADD("audiocpu", UPD7807, 9000000) /* 9MHz ? */
+ MCFG_CPU_CONFIG(upd_config)
+ MCFG_CPU_PROGRAM_MAP(pteacher_upd7807_map)
+ MCFG_CPU_IO_MAP(pteacher_upd7807_io_map)
+ MCFG_CPU_VBLANK_INT("screen", upd7807_irq)
- MDRV_QUANTUM_TIME(HZ(6000)) // should be enough
+ MCFG_QUANTUM_TIME(HZ(6000)) // should be enough
- MDRV_MACHINE_START(pteacher)
- MDRV_MACHINE_RESET(pteacher)
+ MCFG_MACHINE_START(pteacher)
+ MCFG_MACHINE_RESET(pteacher)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
// visible area can be changed at runtime
- MDRV_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pteacher)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(pteacher)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(pteacher)
- MDRV_VIDEO_START(pteacher)
- MDRV_VIDEO_UPDATE(pteacher)
- MDRV_VIDEO_EOF(homedata)
+ MCFG_PALETTE_INIT(pteacher)
+ MCFG_VIDEO_START(pteacher)
+ MCFG_VIDEO_UPDATE(pteacher)
+ MCFG_VIDEO_EOF(homedata)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually
+ 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
static MACHINE_CONFIG_DERIVED( mjkinjas, pteacher )
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_CLOCK(11000000) /* 11MHz ? */
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_CLOCK(11000000) /* 11MHz ? */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lemnangl, pteacher )
/* video hardware */
- MDRV_GFXDECODE(lemnangl)
+ MCFG_GFXDECODE(lemnangl)
- MDRV_VIDEO_START(lemnangl)
+ MCFG_VIDEO_START(lemnangl)
MACHINE_CONFIG_END
static INPUT_PORTS_START( mirderby )
@@ -1536,46 +1536,46 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mirderby, homedata_state )
- MDRV_CPU_ADD("maincpu", M6809, 16000000/8) /* 2 Mhz */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_ADD("maincpu", M6809, 16000000/8) /* 2 Mhz */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
/* basic machine hardware */
- MDRV_CPU_ADD("cpu0", Z80, 16000000/4) /* 4 Mhz */
- MDRV_DEVICE_DISABLE()
- MDRV_CPU_PROGRAM_MAP(cpu0_map)
+ MCFG_CPU_ADD("cpu0", Z80, 16000000/4) /* 4 Mhz */
+ MCFG_DEVICE_DISABLE()
+ MCFG_CPU_PROGRAM_MAP(cpu0_map)
- MDRV_CPU_ADD("cpu1", M6809, 16000000/8) /* 2 Mhz */
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_DEVICE_DISABLE()
- //MDRV_CPU_VBLANK_INT("screen", mirderby_irq)
+ MCFG_CPU_ADD("cpu1", M6809, 16000000/8) /* 2 Mhz */
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_DISABLE()
+ //MCFG_CPU_VBLANK_INT("screen", mirderby_irq)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59)
- 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, 54*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59)
+ 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, 54*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mirderby)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(mirderby)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_PALETTE_INIT(mirderby)
- MDRV_VIDEO_START(mirderby)
- MDRV_VIDEO_UPDATE(mirderby)
+ MCFG_PALETTE_INIT(mirderby)
+ MCFG_VIDEO_START(mirderby)
+ MCFG_VIDEO_UPDATE(mirderby)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 2000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 2000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
MACHINE_CONFIG_END
/**************************************************************************/
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 5303e881d38..a69bfd7ce6b 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -221,35 +221,35 @@ static MACHINE_RESET( homerun )
static MACHINE_CONFIG_START( homerun, homerun_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(homerun_memmap)
- MDRV_CPU_IO_MAP(homerun_iomap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(homerun_memmap)
+ MCFG_CPU_IO_MAP(homerun_iomap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(homerun)
- MDRV_MACHINE_RESET(homerun)
+ MCFG_MACHINE_START(homerun)
+ MCFG_MACHINE_RESET(homerun)
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_intf )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-25)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-25)
- MDRV_GFXDECODE(homerun)
- MDRV_PALETTE_LENGTH(16*4)
+ MCFG_GFXDECODE(homerun)
+ MCFG_PALETTE_LENGTH(16*4)
- MDRV_VIDEO_START(homerun)
- MDRV_VIDEO_UPDATE(homerun)
+ MCFG_VIDEO_START(homerun)
+ MCFG_VIDEO_UPDATE(homerun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 6000000/2)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 6000000/2)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 6c8a6f184bd..7d8acb72a6d 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -922,54 +922,54 @@ static const k037122_interface hornet_k037122_intf_r =
static MACHINE_CONFIG_START( hornet, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(hornet_map)
+ MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_PROGRAM_MAP(hornet_map)
- MDRV_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc0_map)
+ MCFG_CPU_ADD("dsp", ADSP21062, 36000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(sharc0_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START( hornet )
- MDRV_MACHINE_RESET( hornet )
+ MCFG_MACHINE_START( hornet )
+ MCFG_MACHINE_RESET( hornet )
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "screen")
- MDRV_3DFX_VOODOO_CPU("dsp")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4)
- MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
+ MCFG_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "screen")
+ MCFG_3DFX_VOODOO_CPU("dsp")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 4)
+ MCFG_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
- MDRV_K033906_ADD("k033906_1", hornet_k033906_intf_0)
+ MCFG_K033906_ADD("k033906_1", hornet_k033906_intf_0)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 48*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 48*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_VIDEO_UPDATE(hornet)
+ MCFG_VIDEO_UPDATE(hornet)
- MDRV_K037122_ADD("k037122_1", hornet_k037122_intf)
+ MCFG_K037122_ADD("k037122_1", hornet_k037122_intf)
- MDRV_K056800_ADD("k056800", hornet_k056800_interface)
+ MCFG_K056800_ADD("k056800", hornet_k056800_interface)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("rfsnd", RF5C400, 16934400) // value from Guru readme, gives 44100 Hz sample rate
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("rfsnd", RF5C400, 16934400) // value from Guru readme, gives 44100 Hz sample rate
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_M48T58_ADD( "m48t58" )
+ MCFG_M48T58_ADD( "m48t58" )
- MDRV_ADC12138_ADD( "adc12138", hornet_adc_interface )
+ MCFG_ADC12138_ADD( "adc12138", hornet_adc_interface )
MACHINE_CONFIG_END
@@ -992,68 +992,68 @@ static MACHINE_RESET( hornet_2board )
static MACHINE_CONFIG_DERIVED( hornet_2board, hornet )
- MDRV_CPU_ADD("dsp2", ADSP21062, 36000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc1_map)
+ MCFG_CPU_ADD("dsp2", ADSP21062, 36000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(sharc1_map)
- MDRV_MACHINE_RESET(hornet_2board)
+ MCFG_MACHINE_RESET(hornet_2board)
- MDRV_VIDEO_UPDATE(hornet_2board)
+ MCFG_VIDEO_UPDATE(hornet_2board)
- MDRV_DEVICE_REMOVE("k037122_1")
- MDRV_K037122_ADD("k037122_1", hornet_k037122_intf_l)
- MDRV_K037122_ADD("k037122_2", hornet_k037122_intf_r)
+ MCFG_DEVICE_REMOVE("k037122_1")
+ MCFG_K037122_ADD("k037122_1", hornet_k037122_intf_l)
+ MCFG_K037122_ADD("k037122_2", hornet_k037122_intf_r)
- MDRV_DEVICE_REMOVE("voodoo0")
- MDRV_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "lscreen")
- MDRV_3DFX_VOODOO_CPU("dsp")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4)
- MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
+ MCFG_DEVICE_REMOVE("voodoo0")
+ MCFG_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "lscreen")
+ MCFG_3DFX_VOODOO_CPU("dsp")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 4)
+ MCFG_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
- MDRV_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, 2, "rscreen")
- MDRV_3DFX_VOODOO_CPU("dsp2")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4)
- MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_1)
+ MCFG_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, 2, "rscreen")
+ MCFG_3DFX_VOODOO_CPU("dsp2")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 4)
+ MCFG_3DFX_VOODOO_VBLANK(voodoo_vblank_1)
- MDRV_K033906_ADD("k033906_2", hornet_k033906_intf_1)
+ MCFG_K033906_ADD("k033906_2", hornet_k033906_intf_1)
/* video hardware */
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_DEVICE_REMOVE("screen")
+ MCFG_DEVICE_REMOVE("screen")
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(512, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(512, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(512, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(512, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( terabrst, hornet_2board )
- MDRV_CPU_ADD("gn680", M68000, 32000000/2) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(gn680_memmap)
+ MCFG_CPU_ADD("gn680", M68000, 32000000/2) /* 16MHz */
+ MCFG_CPU_PROGRAM_MAP(gn680_memmap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hornet_2board_v2, hornet_2board )
- MDRV_DEVICE_REMOVE("voodoo0")
- MDRV_3DFX_VOODOO_2_ADD("voodoo0", STD_VOODOO_2_CLOCK, 2, "lscreen")
- MDRV_3DFX_VOODOO_CPU("dsp")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4)
- MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
-
- MDRV_DEVICE_REMOVE("voodoo1")
- MDRV_3DFX_VOODOO_2_ADD("voodoo1", STD_VOODOO_2_CLOCK, 2, "rscreen")
- MDRV_3DFX_VOODOO_CPU("dsp2")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4)
- MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_1)
+ MCFG_DEVICE_REMOVE("voodoo0")
+ MCFG_3DFX_VOODOO_2_ADD("voodoo0", STD_VOODOO_2_CLOCK, 2, "lscreen")
+ MCFG_3DFX_VOODOO_CPU("dsp")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 4)
+ MCFG_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
+
+ MCFG_DEVICE_REMOVE("voodoo1")
+ MCFG_3DFX_VOODOO_2_ADD("voodoo1", STD_VOODOO_2_CLOCK, 2, "rscreen")
+ MCFG_3DFX_VOODOO_CPU("dsp2")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 4)
+ MCFG_3DFX_VOODOO_VBLANK(voodoo_vblank_1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index c0f3ef2ebbb..d0f926c55c9 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -209,30 +209,30 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( hotblock, hotblock_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8088, 10000000)
- MDRV_CPU_PROGRAM_MAP(hotblock_map)
- MDRV_CPU_IO_MAP(hotblock_io)
- MDRV_CPU_VBLANK_INT("screen", hotblocks_irq)
+ MCFG_CPU_ADD("maincpu", I8088, 10000000)
+ MCFG_CPU_PROGRAM_MAP(hotblock_map)
+ MCFG_CPU_IO_MAP(hotblock_io)
+ MCFG_CPU_VBLANK_INT("screen", hotblocks_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(1024,1024)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-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(1024,1024)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(hotblock)
- MDRV_VIDEO_UPDATE(hotblock)
+ MCFG_VIDEO_START(hotblock)
+ MCFG_VIDEO_UPDATE(hotblock)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
ROM_START( hotblock )
diff --git a/src/mame/drivers/hotstuff.c b/src/mame/drivers/hotstuff.c
index 373ae706c3d..db75036abce 100644
--- a/src/mame/drivers/hotstuff.c
+++ b/src/mame/drivers/hotstuff.c
@@ -66,21 +66,21 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( hotstuff, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(hotstuff_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(hotstuff_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- 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(128*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA((0x10*4)+8, 101*8-1, 0*8, 33*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_RGB32)
+ MCFG_SCREEN_SIZE(128*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA((0x10*4)+8, 101*8-1, 0*8, 33*8-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(hotstuff)
- MDRV_VIDEO_UPDATE(hotstuff)
+ MCFG_VIDEO_START(hotstuff)
+ MCFG_VIDEO_UPDATE(hotstuff)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c
index 10ead2395b5..3d9e6efa803 100644
--- a/src/mame/drivers/hvyunit.c
+++ b/src/mame/drivers/hvyunit.c
@@ -615,50 +615,50 @@ static const kaneko_pandora_interface hvyunit_pandora_config =
static MACHINE_CONFIG_START( hvyunit, hvyunit_state )
- MDRV_CPU_ADD("master", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(master_memory)
- MDRV_CPU_IO_MAP(master_io)
- MDRV_CPU_VBLANK_INT_HACK(hvyunit_interrupt, 2)
+ MCFG_CPU_ADD("master", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(master_memory)
+ MCFG_CPU_IO_MAP(master_io)
+ MCFG_CPU_VBLANK_INT_HACK(hvyunit_interrupt, 2)
- MDRV_CPU_ADD("slave", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(slave_memory)
- MDRV_CPU_IO_MAP(slave_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("slave", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(slave_memory)
+ MCFG_CPU_IO_MAP(slave_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(sound_memory)
- MDRV_CPU_IO_MAP(sound_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("soundcpu", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(sound_memory)
+ MCFG_CPU_IO_MAP(sound_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mermaid", I80C51, 6000000)
- MDRV_CPU_IO_MAP(mcu_io)
+ MCFG_CPU_ADD("mermaid", I80C51, 6000000)
+ MCFG_CPU_IO_MAP(mcu_io)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(hvyunit)
- MDRV_MACHINE_RESET(hvyunit)
+ MCFG_MACHINE_START(hvyunit)
+ MCFG_MACHINE_RESET(hvyunit)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
- MDRV_GFXDECODE(hvyunit)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(hvyunit)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_KANEKO_PANDORA_ADD("pandora", hvyunit_pandora_config)
+ MCFG_KANEKO_PANDORA_ADD("pandora", hvyunit_pandora_config)
- MDRV_VIDEO_START(hvyunit)
- MDRV_VIDEO_UPDATE(hvyunit)
- MDRV_VIDEO_EOF(hvyunit)
+ MCFG_VIDEO_START(hvyunit)
+ MCFG_VIDEO_UPDATE(hvyunit)
+ MCFG_VIDEO_EOF(hvyunit)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index f34bc6f9357..d7949f75baa 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -248,34 +248,34 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( hyhoo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz ?? */
- MDRV_CPU_PROGRAM_MAP(hyhoo_map)
- MDRV_CPU_IO_MAP(hyhoo_io_map)
- MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz ?? */
+ MCFG_CPU_PROGRAM_MAP(hyhoo_map)
+ MCFG_CPU_IO_MAP(hyhoo_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_MACHINE_RESET(nb1413m3)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(nb1413m3)
+ 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_RGB32)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
- MDRV_VIDEO_START(hyhoo)
- MDRV_VIDEO_UPDATE(hyhoo)
+ MCFG_VIDEO_START(hyhoo)
+ MCFG_VIDEO_UPDATE(hyhoo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- 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
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index c3dbdd9f6cc..e357a04d5cb 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -272,62 +272,62 @@ GFXDECODE_END
static MACHINE_CONFIG_START( hyperspt, hyperspt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(hyperspt_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(hyperspt_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- 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(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_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)
- MDRV_GFXDECODE(hyperspt)
- MDRV_PALETTE_LENGTH(16*16+16*16)
+ MCFG_GFXDECODE(hyperspt)
+ MCFG_PALETTE_LENGTH(16*16+16*16)
- MDRV_PALETTE_INIT(hyperspt)
- MDRV_VIDEO_START(hyperspt)
- MDRV_VIDEO_UPDATE(hyperspt)
+ MCFG_PALETTE_INIT(hyperspt)
+ MCFG_VIDEO_START(hyperspt)
+ MCFG_VIDEO_UPDATE(hyperspt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("snsnd", SN76496, XTAL_14_31818MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76496, XTAL_14_31818MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hypersptb, hyperspt )
- MDRV_DEVICE_REMOVE("vlm")
+ MCFG_DEVICE_REMOVE("vlm")
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(soundb_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(soundb_map)
- MDRV_FRAGMENT_ADD(hyprolyb_adpcm)
+ MCFG_FRAGMENT_ADD(hyprolyb_adpcm)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( roadf, hyperspt )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(roadf_map)
- MDRV_GFXDECODE(roadf)
- MDRV_VIDEO_START(roadf)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(roadf_map)
+ MCFG_GFXDECODE(roadf)
+ MCFG_VIDEO_START(roadf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index a974999b669..e46ab7eae5e 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -674,85 +674,85 @@ static MACHINE_START( magerror )
static MACHINE_CONFIG_START( hyprduel, hyprduel_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
- MDRV_CPU_PROGRAM_MAP(hyprduel_map)
- MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES)
+ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
+ MCFG_CPU_PROGRAM_MAP(hyprduel_map)
+ MCFG_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES)
- MDRV_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */
- MDRV_CPU_PROGRAM_MAP(hyprduel_map2)
+ MCFG_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */
+ MCFG_CPU_PROGRAM_MAP(hyprduel_map2)
- MDRV_MACHINE_START(hyprduel)
- MDRV_MACHINE_RESET(hyprduel)
+ MCFG_MACHINE_START(hyprduel)
+ MCFG_MACHINE_RESET(hyprduel)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
- 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, FIRST_VISIBLE_LINE, LAST_VISIBLE_LINE)
+ 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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, FIRST_VISIBLE_LINE, LAST_VISIBLE_LINE)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(hyprduel_14220)
- MDRV_VIDEO_UPDATE(hyprduel)
+ MCFG_VIDEO_START(hyprduel_14220)
+ MCFG_VIDEO_UPDATE(hyprduel)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki", 4000000/16/16*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57)
+ MCFG_OKIM6295_ADD("oki", 4000000/16/16*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( magerror, hyprduel_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
- MDRV_CPU_PROGRAM_MAP(magerror_map)
- MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES)
+ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
+ MCFG_CPU_PROGRAM_MAP(magerror_map)
+ MCFG_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES)
- MDRV_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */
- MDRV_CPU_PROGRAM_MAP(magerror_map2)
+ MCFG_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */
+ MCFG_CPU_PROGRAM_MAP(magerror_map2)
- MDRV_MACHINE_START(magerror)
- MDRV_MACHINE_RESET(hyprduel)
+ MCFG_MACHINE_START(magerror)
+ MCFG_MACHINE_RESET(hyprduel)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
- 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, FIRST_VISIBLE_LINE, LAST_VISIBLE_LINE)
+ 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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, FIRST_VISIBLE_LINE, LAST_VISIBLE_LINE)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(magerror_14220)
- MDRV_VIDEO_UPDATE(hyprduel)
+ MCFG_VIDEO_START(magerror_14220)
+ MCFG_VIDEO_UPDATE(hyprduel)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
- MDRV_OKIM6295_ADD("oki", 4000000/16/16*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57)
+ MCFG_OKIM6295_ADD("oki", 4000000/16/16*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index 8b4a3110bfe..20f39ba958e 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -633,42 +633,42 @@ static INTERRUPT_GEN( jingbell_interrupt )
static MACHINE_CONFIG_START( jingbell, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(jingbell_map)
- MDRV_CPU_IO_MAP(jingbell_portmap)
- MDRV_CPU_VBLANK_INT("screen",jingbell_interrupt)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
+ MCFG_CPU_PROGRAM_MAP(jingbell_map)
+ MCFG_CPU_IO_MAP(jingbell_portmap)
+ MCFG_CPU_VBLANK_INT("screen",jingbell_interrupt)
- MDRV_MACHINE_RESET(jingbell)
+ MCFG_MACHINE_RESET(jingbell)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-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-16-1)
- MDRV_GFXDECODE(jingbell)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(jingbell)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(jingbell)
- MDRV_VIDEO_UPDATE(jingbell)
+ MCFG_VIDEO_START(jingbell)
+ MCFG_VIDEO_UPDATE(jingbell)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gp98, jingbell )
- MDRV_GFXDECODE(gp98)
+ MCFG_GFXDECODE(gp98)
- MDRV_VIDEO_START(gp98)
+ MCFG_VIDEO_START(gp98)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index 34f23fa8f73..1c3a43cb4f9 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -3461,28 +3461,28 @@ GFXDECODE_END
#endif
static MACHINE_CONFIG_START( igs011_base, driver_device )
- MDRV_CPU_ADD("maincpu",M68000, XTAL_22MHz/3)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL_22MHz/3)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-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, 240-1)
- MDRV_PALETTE_LENGTH(0x800)
-// MDRV_GFXDECODE(igs011)
+ MCFG_PALETTE_LENGTH(0x800)
+// MCFG_GFXDECODE(igs011)
- MDRV_VIDEO_START( igs011 )
- MDRV_VIDEO_UPDATE( igs011 )
+ MCFG_VIDEO_START( igs011 )
+ MCFG_VIDEO_UPDATE( igs011 )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_22MHz/21, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", XTAL_22MHz/21, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static INTERRUPT_GEN( drgnwrld_interrupt )
@@ -3496,17 +3496,17 @@ static INTERRUPT_GEN( drgnwrld_interrupt )
}
static MACHINE_CONFIG_DERIVED( drgnwrld, igs011_base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(drgnwrld)
- MDRV_CPU_VBLANK_INT_HACK(drgnwrld_interrupt,1+4) // lev5 frequency drives the music tempo
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(drgnwrld)
+ MCFG_CPU_VBLANK_INT_HACK(drgnwrld_interrupt,1+4) // lev5 frequency drives the music tempo
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( drgnwrld_igs012, drgnwrld )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(drgnwrld_igs012)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(drgnwrld_igs012)
MACHINE_CONFIG_END
@@ -3527,9 +3527,9 @@ static INTERRUPT_GEN( lhb_interrupt )
}
static MACHINE_CONFIG_DERIVED( lhb, igs011_base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lhb)
- MDRV_CPU_VBLANK_INT_HACK(lhb_interrupt,3+1)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(lhb)
+ MCFG_CPU_VBLANK_INT_HACK(lhb_interrupt,3+1)
MACHINE_CONFIG_END
@@ -3544,30 +3544,30 @@ static INTERRUPT_GEN( wlcc_interrupt )
}
static MACHINE_CONFIG_DERIVED( wlcc, igs011_base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wlcc)
- MDRV_CPU_VBLANK_INT_HACK(wlcc_interrupt,2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wlcc)
+ MCFG_CPU_VBLANK_INT_HACK(wlcc_interrupt,2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( xymg, igs011_base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(xymg)
- MDRV_CPU_VBLANK_INT_HACK(wlcc_interrupt,2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(xymg)
+ MCFG_CPU_VBLANK_INT_HACK(wlcc_interrupt,2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lhb2, igs011_base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lhb2)
- MDRV_CPU_VBLANK_INT_HACK(drgnwrld_interrupt,1+4) // lev5 frequency drives the music tempo
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(lhb2)
+ MCFG_CPU_VBLANK_INT_HACK(drgnwrld_interrupt,1+4) // lev5 frequency drives the music tempo
-// MDRV_GFXDECODE(igs011_hi)
+// MCFG_GFXDECODE(igs011_hi)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3594,18 +3594,18 @@ static INTERRUPT_GEN( vbowl_interrupt )
}
static MACHINE_CONFIG_DERIVED( vbowl, igs011_base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vbowl)
- MDRV_CPU_VBLANK_INT_HACK(vbowl_interrupt,3+4)
-
- MDRV_VIDEO_EOF(vbowl) // trackball
-// MDRV_GFXDECODE(igs011_hi)
-
- MDRV_DEVICE_REMOVE("oki")
-// MDRV_SOUND_ADD("ics", ICS2115, 0)
- MDRV_ICS2115_ADD("ics", 0, sound_irq)
-// MDRV_SOUND_CONFIG(vbowl_ics2115_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(vbowl)
+ MCFG_CPU_VBLANK_INT_HACK(vbowl_interrupt,3+4)
+
+ MCFG_VIDEO_EOF(vbowl) // trackball
+// MCFG_GFXDECODE(igs011_hi)
+
+ MCFG_DEVICE_REMOVE("oki")
+// MCFG_SOUND_ADD("ics", ICS2115, 0)
+ MCFG_ICS2115_ADD("ics", 0, sound_irq)
+// MCFG_SOUND_CONFIG(vbowl_ics2115_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index 3df5a20b055..c1ab92e056f 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -2028,37 +2028,37 @@ static MACHINE_RESET( iqblocka )
}
static MACHINE_CONFIG_START( iqblocka, driver_device )
- MDRV_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(iqblocka_map)
- MDRV_CPU_IO_MAP(iqblocka_io)
- MDRV_CPU_VBLANK_INT_HACK(iqblocka_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(iqblocka_map)
+ MCFG_CPU_IO_MAP(iqblocka_io)
+ MCFG_CPU_VBLANK_INT_HACK(iqblocka_interrupt,2)
- MDRV_PPI8255_ADD( "ppi8255", iqblocka_ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", iqblocka_ppi8255_intf )
- MDRV_MACHINE_RESET(iqblocka)
+ MCFG_MACHINE_RESET(iqblocka)
/* 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, 240-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, 240-1)
- MDRV_GFXDECODE(igs017)
- MDRV_PALETTE_LENGTH(0x100*2)
+ MCFG_GFXDECODE(igs017)
+ MCFG_PALETTE_LENGTH(0x100*2)
- MDRV_VIDEO_START(igs017)
- MDRV_VIDEO_UPDATE(igs017)
- MDRV_VIDEO_RESET(igs017)
+ MCFG_VIDEO_START(igs017)
+ MCFG_VIDEO_UPDATE(igs017)
+ MCFG_VIDEO_RESET(igs017)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz / 16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -2100,33 +2100,33 @@ static const ppi8255_interface mgcs_ppi8255_intf =
};
static MACHINE_CONFIG_START( mgcs, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
- MDRV_CPU_PROGRAM_MAP(mgcs)
- MDRV_CPU_VBLANK_INT_HACK(mgcs_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(mgcs)
+ MCFG_CPU_VBLANK_INT_HACK(mgcs_interrupt,2)
- MDRV_MACHINE_RESET(mgcs)
+ MCFG_MACHINE_RESET(mgcs)
- MDRV_PPI8255_ADD( "ppi8255", mgcs_ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", mgcs_ppi8255_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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-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, 240-1)
- MDRV_GFXDECODE(igs017_flipped)
- MDRV_PALETTE_LENGTH(0x100*2)
+ MCFG_GFXDECODE(igs017_flipped)
+ MCFG_PALETTE_LENGTH(0x100*2)
- MDRV_VIDEO_START(igs017)
- MDRV_VIDEO_UPDATE(igs017)
- MDRV_VIDEO_RESET(igs017)
+ MCFG_VIDEO_START(igs017)
+ MCFG_VIDEO_UPDATE(igs017)
+ MCFG_VIDEO_RESET(igs017)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_8MHz / 8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -2145,33 +2145,33 @@ static const ppi8255_interface sdmg2_ppi8255_intf =
};
static MACHINE_CONFIG_START( sdmg2, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_22MHz/2)
- MDRV_CPU_PROGRAM_MAP(sdmg2)
- MDRV_CPU_VBLANK_INT_HACK(mgcs_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz/2)
+ MCFG_CPU_PROGRAM_MAP(sdmg2)
+ MCFG_CPU_VBLANK_INT_HACK(mgcs_interrupt,2)
- MDRV_MACHINE_RESET(mgcs)
+ MCFG_MACHINE_RESET(mgcs)
- MDRV_PPI8255_ADD( "ppi8255", sdmg2_ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", sdmg2_ppi8255_intf )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60) // VSync 60Hz, HSync 15.3kHz
- 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-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60) // VSync 60Hz, HSync 15.3kHz
+ 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-16-1)
- MDRV_GFXDECODE(igs017)
- MDRV_PALETTE_LENGTH(0x100*2)
+ MCFG_GFXDECODE(igs017)
+ MCFG_PALETTE_LENGTH(0x100*2)
- MDRV_VIDEO_START(igs017)
- MDRV_VIDEO_UPDATE(igs017)
- MDRV_VIDEO_RESET(igs017)
+ MCFG_VIDEO_START(igs017)
+ MCFG_VIDEO_UPDATE(igs017)
+ MCFG_VIDEO_RESET(igs017)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_22MHz / 22, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -2203,33 +2203,33 @@ static const ppi8255_interface mgdh_ppi8255_intf =
};
static MACHINE_CONFIG_START( mgdh, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
- MDRV_CPU_PROGRAM_MAP(mgdh_map)
- MDRV_CPU_VBLANK_INT_HACK(mgdh_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(mgdh_map)
+ MCFG_CPU_VBLANK_INT_HACK(mgdh_interrupt,2)
- MDRV_MACHINE_RESET(mgcs)
+ MCFG_MACHINE_RESET(mgcs)
- MDRV_PPI8255_ADD( "ppi8255", mgdh_ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", mgdh_ppi8255_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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-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-16-1)
- MDRV_GFXDECODE(igs017_swapped)
- MDRV_PALETTE_LENGTH(0x100*2)
+ MCFG_GFXDECODE(igs017_swapped)
+ MCFG_PALETTE_LENGTH(0x100*2)
- MDRV_VIDEO_START(igs017)
- MDRV_VIDEO_UPDATE(igs017)
- MDRV_VIDEO_RESET(igs017)
+ MCFG_VIDEO_START(igs017)
+ MCFG_VIDEO_UPDATE(igs017)
+ MCFG_VIDEO_RESET(igs017)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_22MHz / 22, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index dc9af81edfe..33e3454b762 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -366,27 +366,27 @@ static INTERRUPT_GEN( igs_majhong_interrupt )
static MACHINE_CONFIG_START( igs_majhong, driver_device )
- MDRV_CPU_ADD("maincpu",ARM7, 20000000)
+ MCFG_CPU_ADD("maincpu",ARM7, 20000000)
- MDRV_CPU_PROGRAM_MAP(igs_majhong_map)
+ MCFG_CPU_PROGRAM_MAP(igs_majhong_map)
- MDRV_CPU_VBLANK_INT("screen", igs_majhong_interrupt)
- //MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_CPU_VBLANK_INT("screen", igs_majhong_interrupt)
+ //MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_GFXDECODE(igs_m027)
+ MCFG_GFXDECODE(igs_m027)
- 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-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-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START( igs_majhong )
- MDRV_VIDEO_UPDATE( igs_majhong )
+ MCFG_VIDEO_START( igs_majhong )
+ MCFG_VIDEO_UPDATE( igs_majhong )
/* sound hardware */
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index f6d9bf90870..837af5ab016 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -1559,31 +1559,31 @@ GFXDECODE_END
static MACHINE_CONFIG_START( igspoker, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(igspoker_prg_map)
- MDRV_CPU_IO_MAP(igspoker_io_map)
- MDRV_CPU_VBLANK_INT_HACK(igs_interrupt,8)
+ MCFG_CPU_ADD("maincpu",Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(igspoker_prg_map)
+ MCFG_CPU_IO_MAP(igspoker_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(igs_interrupt,8)
- MDRV_MACHINE_RESET(igs)
+ MCFG_MACHINE_RESET(igs)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- 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, 64*8-1, 0, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ 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, 64*8-1, 0, 32*8-1)
- MDRV_GFXDECODE(igspoker)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(igspoker)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(igs_video)
- MDRV_VIDEO_UPDATE(igs_video)
+ MCFG_VIDEO_START(igs_video)
+ MCFG_VIDEO_UPDATE(igs_video)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1600,21 +1600,21 @@ static MACHINE_CONFIG_DERIVED( igs_ncs, igspoker )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( number10, igspoker )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(number10_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(number10_io_map)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_VIDEO_START(cpokerpk)
- MDRV_VIDEO_UPDATE(cpokerpk)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_VIDEO_START(cpokerpk)
+ MCFG_VIDEO_UPDATE(cpokerpk)
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cpokerpk, number10 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(cpokerpk_io_map)
- MDRV_GFXDECODE(cpokerpk)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(cpokerpk_io_map)
+ MCFG_GFXDECODE(cpokerpk)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index ad3002d1e5b..5afe349d2f1 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -224,42 +224,42 @@ static MACHINE_RESET( ikki )
static MACHINE_CONFIG_START( ikki, ikki_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(ikki_cpu1)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
+ MCFG_CPU_PROGRAM_MAP(ikki_cpu1)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(ikki_cpu2)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
+ MCFG_CPU_PROGRAM_MAP(ikki_cpu2)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(ikki)
- MDRV_MACHINE_RESET(ikki)
+ MCFG_MACHINE_START(ikki)
+ MCFG_MACHINE_RESET(ikki)
/* 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(1*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(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(ikki)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ikki)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(ikki)
- MDRV_VIDEO_START(ikki)
- MDRV_VIDEO_UPDATE(ikki)
+ MCFG_PALETTE_INIT(ikki)
+ MCFG_VIDEO_START(ikki)
+ MCFG_VIDEO_UPDATE(ikki)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 8000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("sn1", SN76496, 8000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD("sn2", SN76496, 8000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("sn2", SN76496, 8000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index fb300069cde..c35505bfcdd 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -552,36 +552,36 @@ static MACHINE_RESET( imolagp )
static MACHINE_CONFIG_START( imolagp, imolagp_state )
- MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(imolagp_master)
- MDRV_CPU_IO_MAP(readport_master)
- MDRV_CPU_VBLANK_INT_HACK(master_interrupt,4)
-
- MDRV_CPU_ADD("slave", Z80,8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(imolagp_slave)
- MDRV_CPU_IO_MAP(readport_slave)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- MDRV_QUANTUM_TIME(HZ(6000))
-
- MDRV_MACHINE_START(imolagp)
- MDRV_MACHINE_RESET(imolagp)
-
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
-
- 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(256,256)
- MDRV_SCREEN_VISIBLE_AREA(0+64-16,255,0+16,255)
-
- MDRV_PALETTE_LENGTH(0x20)
- MDRV_VIDEO_START(imolagp)
- MDRV_VIDEO_UPDATE(imolagp)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(imolagp_master)
+ MCFG_CPU_IO_MAP(readport_master)
+ MCFG_CPU_VBLANK_INT_HACK(master_interrupt,4)
+
+ MCFG_CPU_ADD("slave", Z80,8000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(imolagp_slave)
+ MCFG_CPU_IO_MAP(readport_slave)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ MCFG_QUANTUM_TIME(HZ(6000))
+
+ MCFG_MACHINE_START(imolagp)
+ MCFG_MACHINE_RESET(imolagp)
+
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_intf )
+
+ 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(256,256)
+ MCFG_SCREEN_VISIBLE_AREA(0+64-16,255,0+16,255)
+
+ MCFG_PALETTE_LENGTH(0x20)
+ MCFG_VIDEO_START(imolagp)
+ MCFG_VIDEO_UPDATE(imolagp)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( imolagp )
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index c0f7278dd46..cd99807a5c6 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -82,24 +82,24 @@ static VIDEO_UPDATE(intrscti)
static MACHINE_CONFIG_START( intrscti, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(intrscti_map)
- MDRV_CPU_IO_MAP(readport)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(intrscti_map)
+ MCFG_CPU_IO_MAP(readport)
+ 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(256, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 512-1)
-
- MDRV_GFXDECODE(intrscti)
- MDRV_PALETTE_LENGTH(0x100)
-
- MDRV_VIDEO_START(intrscti)
- MDRV_VIDEO_UPDATE(intrscti)
+ 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(256, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 512-1)
+
+ MCFG_GFXDECODE(intrscti)
+ MCFG_PALETTE_LENGTH(0x100)
+
+ MCFG_VIDEO_START(intrscti)
+ MCFG_VIDEO_UPDATE(intrscti)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 46ac82ef9b2..cfa579db773 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -351,42 +351,42 @@ static MACHINE_RESET( inufuku )
static MACHINE_CONFIG_START( inufuku, inufuku_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.00 MHz */
- MDRV_CPU_PROGRAM_MAP(inufuku_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(inufuku_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 32000000/4) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(inufuku_sound_map)
- MDRV_CPU_IO_MAP(inufuku_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 32000000/4) /* 8.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(inufuku_sound_map)
+ MCFG_CPU_IO_MAP(inufuku_sound_io_map)
/* IRQs are triggered by the YM2610 */
- MDRV_MACHINE_START(inufuku)
- MDRV_MACHINE_RESET(inufuku)
+ MCFG_MACHINE_START(inufuku)
+ MCFG_MACHINE_RESET(inufuku)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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(2048, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 319-1, 1, 224-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(2048, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319-1, 1, 224-1)
- MDRV_GFXDECODE(inufuku)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(inufuku)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(inufuku)
- MDRV_VIDEO_UPDATE(inufuku)
+ MCFG_VIDEO_START(inufuku)
+ MCFG_VIDEO_UPDATE(inufuku)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 32000000/4)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.75)
- MDRV_SOUND_ROUTE(2, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 32000000/4)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.75)
+ MCFG_SOUND_ROUTE(2, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index bd341c17c7b..e678ff4d99e 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -268,32 +268,32 @@ GFXDECODE_END
static MACHINE_CONFIG_START( iqblock, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(iqblock_interrupt,16)
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(iqblock)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(iqblock)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(iqblock)
- MDRV_VIDEO_UPDATE(iqblock)
+ MCFG_VIDEO_START(iqblock)
+ MCFG_VIDEO_UPDATE(iqblock)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index 2aeb2d70d17..1f4b2a9c6cb 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -292,45 +292,45 @@ static const pokey_interface pokey_config =
static MACHINE_CONFIG_START( irobot, irobot_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(irobot_map)
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(irobot_map)
- MDRV_MACHINE_RESET(irobot)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(irobot)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* 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(0*8, 32*8-1, 0*8, 29*8-1)
+ 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(0*8, 32*8-1, 0*8, 29*8-1)
- MDRV_GFXDECODE(irobot)
- MDRV_PALETTE_LENGTH(64 + 32) /* 64 for polygons, 32 for text */
+ MCFG_GFXDECODE(irobot)
+ MCFG_PALETTE_LENGTH(64 + 32) /* 64 for polygons, 32 for text */
- MDRV_PALETTE_INIT(irobot)
- MDRV_VIDEO_START(irobot)
- MDRV_VIDEO_UPDATE(irobot)
+ MCFG_PALETTE_INIT(irobot)
+ MCFG_VIDEO_START(irobot)
+ MCFG_VIDEO_UPDATE(irobot)
- MDRV_TIMER_ADD("irvg_timer", irobot_irvg_done_callback)
- MDRV_TIMER_ADD("irmb_timer", irobot_irmb_done_callback)
+ MCFG_TIMER_ADD("irvg_timer", irobot_irvg_done_callback)
+ MCFG_TIMER_ADD("irmb_timer", irobot_irmb_done_callback)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MAIN_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("pokey1", POKEY, MAIN_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("pokey2", POKEY, MAIN_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("pokey2", POKEY, MAIN_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("pokey3", POKEY, MAIN_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("pokey3", POKEY, MAIN_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("pokey4", POKEY, MAIN_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("pokey4", POKEY, MAIN_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index c7f762bece2..505acede2e5 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -379,46 +379,46 @@ static MACHINE_RESET( ironhors )
static MACHINE_CONFIG_START( ironhors, ironhors_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_VBLANK_INT_HACK(ironhors_interrupt,8)
+ MCFG_CPU_ADD("maincpu", M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_VBLANK_INT_HACK(ironhors_interrupt,8)
- MDRV_CPU_ADD("soundcpu",Z80,18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_IO_MAP(slave_io_map)
+ MCFG_CPU_ADD("soundcpu",Z80,18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_IO_MAP(slave_io_map)
- MDRV_MACHINE_START(ironhors)
- MDRV_MACHINE_RESET(ironhors)
+ MCFG_MACHINE_START(ironhors)
+ MCFG_MACHINE_RESET(ironhors)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- 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(1*8, 31*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ 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(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(ironhors)
- MDRV_PALETTE_LENGTH(16*8*16+16*8*16)
+ MCFG_GFXDECODE(ironhors)
+ MCFG_PALETTE_LENGTH(16*8*16+16*8*16)
- MDRV_PALETTE_INIT(ironhors)
- MDRV_VIDEO_START(ironhors)
- MDRV_VIDEO_UPDATE(ironhors)
+ MCFG_PALETTE_INIT(ironhors)
+ MCFG_VIDEO_START(ironhors)
+ MCFG_VIDEO_UPDATE(ironhors)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym2203", YM2203, 18432000/6)
- MDRV_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ADD("ym2203", YM2203, 18432000/6)
+ MCFG_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE_EX(0, "disc_ih", 1.0, 0)
- MDRV_SOUND_ROUTE_EX(1, "disc_ih", 1.0, 1)
- MDRV_SOUND_ROUTE_EX(2, "disc_ih", 1.0, 2)
- MDRV_SOUND_ROUTE_EX(3, "disc_ih", 1.0, 3)
+ MCFG_SOUND_ROUTE_EX(0, "disc_ih", 1.0, 0)
+ MCFG_SOUND_ROUTE_EX(1, "disc_ih", 1.0, 1)
+ MCFG_SOUND_ROUTE_EX(2, "disc_ih", 1.0, 2)
+ MCFG_SOUND_ROUTE_EX(3, "disc_ih", 1.0, 3)
- MDRV_SOUND_ADD("disc_ih", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(ironhors)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("disc_ih", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(ironhors)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -462,20 +462,20 @@ static const ym2203_interface farwest_ym2203_config =
static MACHINE_CONFIG_DERIVED( farwest, ironhors )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(farwest_master_map)
- MDRV_CPU_VBLANK_INT_HACK(farwest_interrupt,255)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(farwest_master_map)
+ MCFG_CPU_VBLANK_INT_HACK(farwest_interrupt,255)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(farwest_slave_map)
- MDRV_CPU_IO_MAP(0)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(farwest_slave_map)
+ MCFG_CPU_IO_MAP(0)
- MDRV_GFXDECODE(farwest)
- MDRV_VIDEO_START(farwest)
- MDRV_VIDEO_UPDATE(farwest)
+ MCFG_GFXDECODE(farwest)
+ MCFG_VIDEO_START(farwest)
+ MCFG_VIDEO_UPDATE(farwest)
- MDRV_SOUND_MODIFY("ym2203")
- MDRV_SOUND_CONFIG(farwest_ym2203_config)
+ MCFG_SOUND_MODIFY("ym2203")
+ MCFG_SOUND_CONFIG(farwest_ym2203_config)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index 99b7c1a3106..ecb528eab5f 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -323,40 +323,40 @@ static INTERRUPT_GEN( vblank_callback_istellar )
/* DRIVER */
static MACHINE_CONFIG_START( istellar, driver_device )
/* main cpu */
- MDRV_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
- MDRV_CPU_PROGRAM_MAP(z80_0_mem)
- MDRV_CPU_IO_MAP(z80_0_io)
- MDRV_CPU_VBLANK_INT("screen", vblank_callback_istellar)
+ MCFG_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(z80_0_mem)
+ MCFG_CPU_IO_MAP(z80_0_io)
+ MCFG_CPU_VBLANK_INT("screen", vblank_callback_istellar)
/* sound cpu */
- MDRV_CPU_ADD("audiocpu", Z80, GUESSED_CLOCK)
- MDRV_CPU_PROGRAM_MAP(z80_1_mem)
- MDRV_CPU_IO_MAP(z80_1_io)
+ MCFG_CPU_ADD("audiocpu", Z80, GUESSED_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(z80_1_mem)
+ MCFG_CPU_IO_MAP(z80_1_io)
/* ldp comm cpu */
- MDRV_CPU_ADD("sub", Z80, GUESSED_CLOCK)
- MDRV_CPU_PROGRAM_MAP(z80_2_mem)
- MDRV_CPU_IO_MAP(z80_2_io)
+ MCFG_CPU_ADD("sub", Z80, GUESSED_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(z80_2_mem)
+ MCFG_CPU_IO_MAP(z80_2_io)
- MDRV_MACHINE_START(istellar)
+ MCFG_MACHINE_START(istellar)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(istellar, 256, 256, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(istellar, 256, 256, BITMAP_FORMAT_INDEXED16)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(istellar)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(istellar)
- MDRV_GFXDECODE(istellar)
+ MCFG_GFXDECODE(istellar)
/* sound 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
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 44eb024ad61..3629c90288e 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -1706,38 +1706,38 @@ static const es5506_interface es5506_config =
static MACHINE_CONFIG_START( timekill, itech32_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(timekill_map)
- MDRV_CPU_VBLANK_INT("screen", generate_int1)
+ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(timekill_map)
+ MCFG_CPU_VBLANK_INT("screen", generate_int1)
- MDRV_CPU_ADD("soundcpu", M6809, SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("soundcpu", M6809, SOUND_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_RESET(itech32)
- MDRV_NVRAM_ADD_CUSTOM("nvram", itech32_state, nvram_init)
+ MCFG_MACHINE_RESET(itech32)
+ MCFG_NVRAM_ADD_CUSTOM("nvram", itech32_state, nvram_init)
- MDRV_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 508, 0, 384, 262, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 508, 0, 384, 262, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(itech32)
- MDRV_VIDEO_UPDATE(itech32)
+ MCFG_VIDEO_START(itech32)
+ MCFG_VIDEO_UPDATE(itech32)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ensoniq", ES5506, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(es5506_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ensoniq", ES5506, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(es5506_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* via */
- MDRV_VIA6522_ADD("via6522_0", SOUND_CLOCK/8, via_interface)
+ MCFG_VIA6522_ADD("via6522_0", SOUND_CLOCK/8, via_interface)
MACHINE_CONFIG_END
@@ -1745,11 +1745,11 @@ static MACHINE_CONFIG_DERIVED( bloodstm, timekill )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bloodstm_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bloodstm_map)
/* video hardware */
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
MACHINE_CONFIG_END
@@ -1757,19 +1757,19 @@ static MACHINE_CONFIG_DERIVED( drivedge, bloodstm )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drivedge_map)
+ MCFG_CPU_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(drivedge_map)
- MDRV_CPU_ADD("dsp1", TMS32031, TMS_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drivedge_tms1_map)
+ MCFG_CPU_ADD("dsp1", TMS32031, TMS_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(drivedge_tms1_map)
- MDRV_CPU_ADD("dsp2", TMS32031, TMS_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drivedge_tms2_map)
+ MCFG_CPU_ADD("dsp2", TMS32031, TMS_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(drivedge_tms2_map)
-// MDRV_CPU_ADD("comm", M6803, 8000000/4) -- network CPU
+// MCFG_CPU_ADD("comm", M6803, 8000000/4) -- network CPU
- MDRV_MACHINE_RESET(drivedge)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_MACHINE_RESET(drivedge)
+ MCFG_QUANTUM_TIME(HZ(6000))
MACHINE_CONFIG_END
@@ -1777,16 +1777,16 @@ static MACHINE_CONFIG_DERIVED( sftm, bloodstm )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
- MDRV_CPU_PROGRAM_MAP(itech020_map)
- MDRV_CPU_VBLANK_INT("screen", generate_int1)
+ MCFG_CPU_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(itech020_map)
+ MCFG_CPU_VBLANK_INT("screen", generate_int1)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(sound_020_map)
- MDRV_CPU_VBLANK_INT_HACK(irq1_line_assert,4)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(sound_020_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq1_line_assert,4)
/* via */
- MDRV_DEVICE_REMOVE("via6522_0")
+ MCFG_DEVICE_REMOVE("via6522_0")
MACHINE_CONFIG_END
@@ -1794,7 +1794,7 @@ static MACHINE_CONFIG_DERIVED( tourny, sftm )
/* basic machine hardware */
- MDRV_M48T02_ADD( "m48t02" )
+ MCFG_M48T02_ADD( "m48t02" )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 2c33dd1aa23..2efa8194839 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -1694,105 +1694,105 @@ static const ym3812_interface ym3812_config =
static MACHINE_CONFIG_START( itech8_core_lo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(tmslo_map)
- MDRV_CPU_VBLANK_INT("screen", generate_nmi)
+ MCFG_CPU_ADD("maincpu", M6809, CLOCK_8MHz/4)
+ MCFG_CPU_PROGRAM_MAP(tmslo_map)
+ MCFG_CPU_VBLANK_INT("screen", generate_nmi)
- MDRV_MACHINE_RESET(itech8)
- MDRV_NVRAM_ADD_RANDOM_FILL("nvram")
+ MCFG_MACHINE_RESET(itech8)
+ MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
- MDRV_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
+ MCFG_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_VIDEO_START(itech8)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_START(itech8)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(512, 263)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(512, 263)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* via */
- MDRV_VIA6522_ADD("via6522_0", CLOCK_8MHz/4, via_interface)
+ MCFG_VIA6522_ADD("via6522_0", CLOCK_8MHz/4, via_interface)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( itech8_core_hi, itech8_core_lo )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tmshi_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tmshi_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2203 )
/* basic machine hardware */
- MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(sound2203_map)
+ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
+ MCFG_CPU_PROGRAM_MAP(sound2203_map)
/* sound hardware */
- MDRV_SOUND_ADD("ymsnd", YM2203, CLOCK_8MHz/2)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.07)
- MDRV_SOUND_ROUTE(1, "mono", 0.07)
- MDRV_SOUND_ROUTE(2, "mono", 0.07)
- MDRV_SOUND_ROUTE(3, "mono", 0.75)
-
- MDRV_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2203, CLOCK_8MHz/2)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.07)
+ MCFG_SOUND_ROUTE(1, "mono", 0.07)
+ MCFG_SOUND_ROUTE(2, "mono", 0.07)
+ MCFG_SOUND_ROUTE(3, "mono", 0.75)
+
+ MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2608b )
/* basic machine hardware */
- MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(sound2608b_map)
+ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
+ MCFG_CPU_PROGRAM_MAP(sound2608b_map)
/* sound hardware */
- MDRV_SOUND_ADD("ymsnd", YM2608, CLOCK_8MHz)
- MDRV_SOUND_CONFIG(ym2608b_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2608, CLOCK_8MHz)
+ MCFG_SOUND_CONFIG(ym2608b_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812 )
/* basic machine hardware */
- MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(sound3812_map)
+ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
+ MCFG_CPU_PROGRAM_MAP(sound3812_map)
- MDRV_PIA6821_ADD("pia", pia_interface)
+ MCFG_PIA6821_ADD("pia", pia_interface)
/* sound hardware */
- MDRV_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812_external )
/* basic machine hardware */
- MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
- MDRV_CPU_PROGRAM_MAP(sound3812_external_map)
+ MCFG_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4)
+ MCFG_CPU_PROGRAM_MAP(sound3812_external_map)
/* sound hardware */
- MDRV_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -1801,104 +1801,104 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wfortune, itech8_core_hi )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym2203)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym2203)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2layer)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( grmatch, itech8_core_hi )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym2608b)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym2608b)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 399, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_grmatch)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 399, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_grmatch)
/* palette updater */
- MDRV_TIMER_ADD_SCANLINE("palette", grmatch_palette_update, "screen", 0, 0)
+ MCFG_TIMER_ADD_SCANLINE("palette", grmatch_palette_update, "screen", 0, 0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( stratab_hi, itech8_core_hi )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym2203)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym2203)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2layer)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( stratab_lo, itech8_core_lo )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym2203)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym2203)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2layer)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( slikshot_hi, itech8_core_hi )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym2203)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym2203)
- MDRV_CPU_ADD("sub", Z80, CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(slikz80_mem_map)
- MDRV_CPU_IO_MAP(slikz80_io_map)
+ MCFG_CPU_ADD("sub", Z80, CLOCK_8MHz/2)
+ MCFG_CPU_PROGRAM_MAP(slikz80_mem_map)
+ MCFG_CPU_IO_MAP(slikz80_io_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_VIDEO_START(slikshot)
- MDRV_VIDEO_UPDATE(slikshot)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_VIDEO_START(slikshot)
+ MCFG_VIDEO_UPDATE(slikshot)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( slikshot_lo, itech8_core_lo )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym2203)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym2203)
- MDRV_CPU_ADD("sub", Z80, CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(slikz80_mem_map)
- MDRV_CPU_IO_MAP(slikz80_io_map)
+ MCFG_CPU_ADD("sub", Z80, CLOCK_8MHz/2)
+ MCFG_CPU_PROGRAM_MAP(slikz80_mem_map)
+ MCFG_CPU_IO_MAP(slikz80_io_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_VIDEO_START(slikshot)
- MDRV_VIDEO_UPDATE(slikshot)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_VIDEO_START(slikshot)
+ MCFG_VIDEO_UPDATE(slikshot)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( slikshot_lo_noz80, itech8_core_lo )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym2203)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym2203)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2page)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2page)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sstrike, slikshot_lo )
/* basic machine hardware */
- MDRV_MACHINE_START(sstrike)
+ MCFG_MACHINE_START(sstrike)
MACHINE_CONFIG_END
@@ -1906,71 +1906,71 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hstennis_hi, itech8_core_hi )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym3812)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym3812)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 399, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2page_large)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 399, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2page_large)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hstennis_lo, itech8_core_lo )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym3812)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym3812)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 399, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2page_large)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 399, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2page_large)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rimrockn, itech8_core_hi )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym3812_external)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym3812_external)
- MDRV_CPU_REPLACE("maincpu", HD6309, CLOCK_12MHz)
- MDRV_CPU_PROGRAM_MAP(tmshi_map)
- MDRV_CPU_VBLANK_INT("screen", generate_nmi)
+ MCFG_CPU_REPLACE("maincpu", HD6309, CLOCK_12MHz)
+ MCFG_CPU_PROGRAM_MAP(tmshi_map)
+ MCFG_CPU_VBLANK_INT("screen", generate_nmi)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(24, 375, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2page_large)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(24, 375, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2page_large)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ninclown, itech8_core_hi )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym3812_external)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym3812_external)
- MDRV_CPU_REPLACE("maincpu", M68000, CLOCK_12MHz)
- MDRV_CPU_PROGRAM_MAP(ninclown_map)
- MDRV_CPU_VBLANK_INT("screen", generate_nmi)
+ MCFG_CPU_REPLACE("maincpu", M68000, CLOCK_12MHz)
+ MCFG_CPU_PROGRAM_MAP(ninclown_map)
+ MCFG_CPU_VBLANK_INT("screen", generate_nmi)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(64, 423, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2page_large)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(64, 423, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2page_large)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gtg2, itech8_core_lo )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(itech8_sound_ym3812_external)
+ MCFG_FRAGMENT_ADD(itech8_sound_ym3812_external)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gtg2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gtg2_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_VIDEO_UPDATE(itech8_2layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_VIDEO_UPDATE(itech8_2layer)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index 2f4920af171..0b46114128d 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -250,28 +250,28 @@ static PALETTE_INIT( itgambl2 )
static MACHINE_CONFIG_START( itgambl2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a H8/3337 core ATM */
- MDRV_CPU_PROGRAM_MAP(itgambl2_map)
+ MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a H8/3337 core ATM */
+ MCFG_CPU_PROGRAM_MAP(itgambl2_map)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
- MDRV_MACHINE_RESET( itgambl2 )
- MDRV_PALETTE_INIT( itgambl2 )
-
- MDRV_GFXDECODE(itgambl2)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START( itgambl2 )
- MDRV_VIDEO_UPDATE( itgambl2 )
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+ MCFG_MACHINE_RESET( itgambl2 )
+ MCFG_PALETTE_INIT( itgambl2 )
+
+ MCFG_GFXDECODE(itgambl2)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_VIDEO_START( itgambl2 )
+ MCFG_VIDEO_UPDATE( itgambl2 )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c
index bb5e53be08f..583e6b47b5c 100644
--- a/src/mame/drivers/itgambl3.c
+++ b/src/mame/drivers/itgambl3.c
@@ -239,28 +239,28 @@ static PALETTE_INIT( itgambl3 )
static MACHINE_CONFIG_START( itgambl3, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
- MDRV_CPU_PROGRAM_MAP(itgambl3_map)
+ MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
+ MCFG_CPU_PROGRAM_MAP(itgambl3_map)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
- MDRV_MACHINE_RESET( itgambl3 )
- MDRV_PALETTE_INIT( itgambl3 )
-
- MDRV_GFXDECODE(itgambl3)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START( itgambl3 )
- MDRV_VIDEO_UPDATE( itgambl3 )
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+ MCFG_MACHINE_RESET( itgambl3 )
+ MCFG_PALETTE_INIT( itgambl3 )
+
+ MCFG_GFXDECODE(itgambl3)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_VIDEO_START( itgambl3 )
+ MCFG_VIDEO_UPDATE( itgambl3 )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", MAIN_CLOCK/16, OKIM6295_PIN7_HIGH) /* 1MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", MAIN_CLOCK/16, OKIM6295_PIN7_HIGH) /* 1MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index 083c7e7ba5d..0a2f2b55aeb 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -182,47 +182,47 @@ static MACHINE_RESET( itgamble )
static MACHINE_CONFIG_START( itgamble, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H83044, MAIN_CLOCK/2) /* probably the wrong CPU */
- MDRV_CPU_PROGRAM_MAP(itgamble_map)
+ MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK/2) /* probably the wrong CPU */
+ MCFG_CPU_PROGRAM_MAP(itgamble_map)
/* 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-1)
- MDRV_MACHINE_RESET( itgamble )
-
- MDRV_GFXDECODE(itgamble)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START( itgamble )
- MDRV_VIDEO_UPDATE( itgamble )
+ 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-1)
+ MCFG_MACHINE_RESET( itgamble )
+
+ MCFG_GFXDECODE(itgamble)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_VIDEO_START( itgamble )
+ MCFG_VIDEO_UPDATE( itgamble )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", SND_CLOCK, OKIM6295_PIN7_HIGH) /* 1MHz resonator */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", SND_CLOCK, OKIM6295_PIN7_HIGH) /* 1MHz resonator */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mnumber, itgamble )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(MNUMBER_MAIN_CLOCK/2) /* probably the wrong CPU */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(MNUMBER_MAIN_CLOCK/2) /* probably the wrong CPU */
- MDRV_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
#ifdef UNUSED_CODE
static MACHINE_CONFIG_DERIVED( ejollyx5, itgamble )
/* wrong CPU. we need a Renesas M16/62A 16bit microcomputer core */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(EJOLLYX5_MAIN_CLOCK/2) /* up to 10MHz.*/
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(EJOLLYX5_MAIN_CLOCK/2) /* up to 10MHz.*/
- MDRV_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 7210373ffee..265b73fb469 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -820,44 +820,44 @@ static MACHINE_RESET( jack )
static MACHINE_CONFIG_START( jack, jack_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18000000/6) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(jack_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* jack needs 1 or its too fast */
+ MCFG_CPU_ADD("maincpu", Z80, 18000000/6) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(jack_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* jack needs 1 or its too fast */
- MDRV_CPU_ADD("audiocpu", Z80,18000000/12) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,18000000/12) /* 1.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_MACHINE_START(jack)
- MDRV_MACHINE_RESET(jack)
+ MCFG_MACHINE_START(jack)
+ MCFG_MACHINE_RESET(jack)
/* 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)
+ 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)
- MDRV_GFXDECODE(jack)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(jack)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_VIDEO_START(jack)
- MDRV_VIDEO_UPDATE(jack)
+ MCFG_VIDEO_START(jack)
+ MCFG_VIDEO_UPDATE(jack)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 18000000/12)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, 18000000/12)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tripool, jack )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* tripool needs 2 or the palette is broken */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* tripool needs 2 or the palette is broken */
MACHINE_CONFIG_END
static INTERRUPT_GEN( joinem_interrupts )
@@ -874,38 +874,38 @@ static INTERRUPT_GEN( joinem_interrupts )
static MACHINE_CONFIG_DERIVED( joinem, jack )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(joinem_map)
- MDRV_CPU_VBLANK_INT_HACK(joinem_interrupts,3)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(joinem_map)
+ MCFG_CPU_VBLANK_INT_HACK(joinem_interrupts,3)
- MDRV_GFXDECODE(joinem)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(joinem)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(joinem)
- MDRV_VIDEO_START(joinem)
- MDRV_VIDEO_UPDATE(joinem)
+ MCFG_PALETTE_INIT(joinem)
+ MCFG_VIDEO_START(joinem)
+ MCFG_VIDEO_UPDATE(joinem)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( loverboy, jack )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(joinem_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(joinem_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_GFXDECODE(joinem)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(joinem)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(joinem)
- MDRV_VIDEO_START(joinem)
- MDRV_VIDEO_UPDATE(joinem)
+ MCFG_PALETTE_INIT(joinem)
+ MCFG_VIDEO_START(joinem)
+ MCFG_VIDEO_UPDATE(joinem)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index 7a546778e6f..c400f6df0cc 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -366,39 +366,39 @@ static MACHINE_RESET( jackal )
static MACHINE_CONFIG_START( jackal, jackal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("master", M6809, MASTER_CLOCK/12) // verified on pcb
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_VBLANK_INT("screen", jackal_interrupt)
+ MCFG_CPU_ADD("master", M6809, MASTER_CLOCK/12) // verified on pcb
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_VBLANK_INT("screen", jackal_interrupt)
- MDRV_CPU_ADD("slave", M6809, MASTER_CLOCK/12) // verified on pcb
- MDRV_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_ADD("slave", M6809, MASTER_CLOCK/12) // verified on pcb
+ MCFG_CPU_PROGRAM_MAP(slave_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(jackal)
- MDRV_MACHINE_RESET(jackal)
+ MCFG_MACHINE_START(jackal)
+ MCFG_MACHINE_RESET(jackal)
/* 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(1*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(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(jackal)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_GFXDECODE(jackal)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_PALETTE_INIT(jackal)
- MDRV_VIDEO_START(jackal)
- MDRV_VIDEO_UPDATE(jackal)
+ MCFG_PALETTE_INIT(jackal)
+ MCFG_VIDEO_START(jackal)
+ MCFG_VIDEO_UPDATE(jackal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) // verified on pcb
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK) // verified on pcb
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index 78b97002f1d..44978226734 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -522,31 +522,31 @@ static DRIVER_INIT( jackie )
static MACHINE_CONFIG_START( jackie, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
- MDRV_CPU_PROGRAM_MAP(jackie_prg_map)
- MDRV_CPU_IO_MAP(jackie_io_map)
- MDRV_CPU_VBLANK_INT_HACK(jackie_interrupt,8)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(jackie_prg_map)
+ MCFG_CPU_IO_MAP(jackie_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(jackie_interrupt,8)
- MDRV_MACHINE_RESET(jackie)
+ MCFG_MACHINE_RESET(jackie)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- 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, 64*8-1, 0, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ 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, 64*8-1, 0, 32*8-1)
- MDRV_GFXDECODE(jackie)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(jackie)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(jackie)
- MDRV_VIDEO_UPDATE(jackie)
+ MCFG_VIDEO_START(jackie)
+ MCFG_VIDEO_UPDATE(jackie)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index 95ce7bc30e1..77a71f1f06a 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -240,30 +240,30 @@ static INTERRUPT_GEN( jackpool_interrupt )
static MACHINE_CONFIG_START( jackpool, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 12000000) // ?
- MDRV_CPU_PROGRAM_MAP(jackpool_mem)
- MDRV_CPU_VBLANK_INT("screen",jackpool_interrupt) // ?
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) // ?
+ MCFG_CPU_PROGRAM_MAP(jackpool_mem)
+ MCFG_CPU_VBLANK_INT("screen",jackpool_interrupt) // ?
- MDRV_GFXDECODE(jackpool)
+ MCFG_GFXDECODE(jackpool)
- 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(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
+ 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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(jackpool)
- MDRV_VIDEO_UPDATE(jackpool)
+ MCFG_VIDEO_START(jackpool)
+ MCFG_VIDEO_UPDATE(jackpool)
- 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/jailbrek.c b/src/mame/drivers/jailbrek.c
index 03e87dd50a8..fff56820ea7 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -254,34 +254,34 @@ static MACHINE_RESET( jailbrek )
static MACHINE_CONFIG_START( jailbrek, jailbrek_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/12)
- MDRV_CPU_PROGRAM_MAP(jailbrek_map)
- MDRV_CPU_VBLANK_INT("screen", jb_interrupt)
- MDRV_CPU_PERIODIC_INT(jb_interrupt_nmi, 500) /* ? */
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/12)
+ MCFG_CPU_PROGRAM_MAP(jailbrek_map)
+ MCFG_CPU_VBLANK_INT("screen", jb_interrupt)
+ MCFG_CPU_PERIODIC_INT(jb_interrupt_nmi, 500) /* ? */
- MDRV_MACHINE_START(jailbrek)
- MDRV_MACHINE_RESET(jailbrek)
+ MCFG_MACHINE_START(jailbrek)
+ MCFG_MACHINE_RESET(jailbrek)
/* video hardware */
- MDRV_GFXDECODE(jailbrek)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(jailbrek)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 396, 8, 248, 256, 16, 240)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 396, 8, 248, 256, 16, 240)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_INIT(jailbrek)
- MDRV_VIDEO_START(jailbrek)
- MDRV_VIDEO_UPDATE(jailbrek)
+ MCFG_PALETTE_INIT(jailbrek)
+ MCFG_VIDEO_START(jailbrek)
+ MCFG_VIDEO_UPDATE(jailbrek)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489A, MASTER_CLOCK/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76489A, MASTER_CLOCK/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("vlm", VLM5030, VOICE_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("vlm", VLM5030, VOICE_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index e156310a286..42457453dc7 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -1303,43 +1303,43 @@ static MACHINE_RESET ( jalmah )
}
static MACHINE_CONFIG_START( jalmah, driver_device )
- MDRV_CPU_ADD("maincpu" , M68000, 12000000) /* 68000-8 */
- MDRV_CPU_PROGRAM_MAP(jalmah)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu" , M68000, 12000000) /* 68000-8 */
+ MCFG_CPU_PROGRAM_MAP(jalmah)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
//M50747 MCU
- MDRV_GFXDECODE(jalmah)
+ MCFG_GFXDECODE(jalmah)
- 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)
+ 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)
- MDRV_PALETTE_LENGTH(0x400)
- MDRV_MACHINE_RESET(jalmah)
+ MCFG_PALETTE_LENGTH(0x400)
+ MCFG_MACHINE_RESET(jalmah)
- MDRV_VIDEO_START(jalmah)
- MDRV_VIDEO_UPDATE(jalmah)
+ MCFG_VIDEO_START(jalmah)
+ MCFG_VIDEO_UPDATE(jalmah)
- MDRV_TIMER_ADD_PERIODIC("mcusim", jalmah_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
+ MCFG_TIMER_ADD_PERIODIC("mcusim", jalmah_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 4000000, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", 4000000, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( urashima, jalmah )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(urashima)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(urashima)
- MDRV_GFXDECODE(urashima)
+ MCFG_GFXDECODE(urashima)
- MDRV_VIDEO_START(urashima)
- MDRV_VIDEO_UPDATE(urashima)
+ MCFG_VIDEO_START(urashima)
+ MCFG_VIDEO_UPDATE(urashima)
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 06f65f1474b..5192f23f698 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -981,108 +981,108 @@ static MACHINE_RESET( jngolady )
static MACHINE_CONFIG_START( jangou, jangou_state )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu0", Z80, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(cpu0_map)
- MDRV_CPU_IO_MAP(cpu0_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("cpu0", Z80, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(cpu0_map)
+ MCFG_CPU_IO_MAP(cpu0_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("cpu1", Z80, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_CPU_IO_MAP(cpu1_io)
+ MCFG_CPU_ADD("cpu1", Z80, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_IO_MAP(cpu1_io)
- MDRV_MACHINE_START(jangou)
- MDRV_MACHINE_RESET(jangou)
+ MCFG_MACHINE_START(jangou)
+ MCFG_MACHINE_RESET(jangou)
/* video hardware */
- MDRV_PALETTE_INIT(jangou)
+ MCFG_PALETTE_INIT(jangou)
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_VIDEO_START(jangou)
- MDRV_VIDEO_UPDATE(jangou)
+ MCFG_VIDEO_START(jangou)
+ MCFG_VIDEO_UPDATE(jangou)
/* sound hardware */
- MDRV_SOUND_START(jangou)
+ MCFG_SOUND_START(jangou)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 16)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 16)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("cvsd", HC55516, MASTER_CLOCK / 1024)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("cvsd", HC55516, MASTER_CLOCK / 1024)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jngolady, jangou )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu0")
- MDRV_CPU_PROGRAM_MAP(jngolady_cpu0_map)
+ MCFG_CPU_MODIFY("cpu0")
+ MCFG_CPU_PROGRAM_MAP(jngolady_cpu0_map)
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(jngolady_cpu1_map)
- MDRV_CPU_IO_MAP(jngolady_cpu1_io)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_PROGRAM_MAP(jngolady_cpu1_map)
+ MCFG_CPU_IO_MAP(jngolady_cpu1_io)
- MDRV_CPU_ADD("nsc", NSC8105, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(nsc_map)
+ MCFG_CPU_ADD("nsc", NSC8105, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(nsc_map)
- MDRV_MACHINE_START(jngolady)
- MDRV_MACHINE_RESET(jngolady)
+ MCFG_MACHINE_START(jngolady)
+ MCFG_MACHINE_RESET(jngolady)
/* sound hardware */
- MDRV_SOUND_START(0)
- MDRV_DEVICE_REMOVE("cvsd")
+ MCFG_SOUND_START(0)
+ MCFG_DEVICE_REMOVE("cvsd")
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cntrygrl, jangou )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu0")
- MDRV_CPU_PROGRAM_MAP(cntrygrl_cpu0_map )
- MDRV_CPU_IO_MAP(cntrygrl_cpu0_io )
+ MCFG_CPU_MODIFY("cpu0")
+ MCFG_CPU_PROGRAM_MAP(cntrygrl_cpu0_map )
+ MCFG_CPU_IO_MAP(cntrygrl_cpu0_io )
- MDRV_DEVICE_REMOVE("cpu1")
+ MCFG_DEVICE_REMOVE("cpu1")
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* sound hardware */
- MDRV_SOUND_START(0)
- MDRV_DEVICE_REMOVE("cvsd")
+ MCFG_SOUND_START(0)
+ MCFG_DEVICE_REMOVE("cvsd")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( roylcrdn, jangou )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu0")
- MDRV_CPU_PROGRAM_MAP(roylcrdn_cpu0_map )
- MDRV_CPU_IO_MAP(roylcrdn_cpu0_io )
+ MCFG_CPU_MODIFY("cpu0")
+ MCFG_CPU_PROGRAM_MAP(roylcrdn_cpu0_map )
+ MCFG_CPU_IO_MAP(roylcrdn_cpu0_io )
- MDRV_DEVICE_REMOVE("cpu1")
+ MCFG_DEVICE_REMOVE("cpu1")
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* sound hardware */
- MDRV_SOUND_START(0)
- MDRV_DEVICE_REMOVE("cvsd")
+ MCFG_SOUND_START(0)
+ MCFG_DEVICE_REMOVE("cvsd")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c
index f206f00cbb9..dbfb3ccccf8 100644
--- a/src/mame/drivers/jantotsu.c
+++ b/src/mame/drivers/jantotsu.c
@@ -504,40 +504,40 @@ static MACHINE_RESET( jantotsu )
static MACHINE_CONFIG_START( jantotsu, jantotsu_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,18432000/4)
- MDRV_CPU_PROGRAM_MAP(jantotsu_map)
- MDRV_CPU_IO_MAP(jantotsu_io)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,18432000/4)
+ MCFG_CPU_PROGRAM_MAP(jantotsu_map)
+ MCFG_CPU_IO_MAP(jantotsu_io)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(jantotsu)
- MDRV_MACHINE_RESET(jantotsu)
+ MCFG_MACHINE_START(jantotsu)
+ MCFG_MACHINE_RESET(jantotsu)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
- MDRV_PALETTE_INIT(jantotsu)
- MDRV_PALETTE_LENGTH(0x20)
+ MCFG_PALETTE_INIT(jantotsu)
+ MCFG_PALETTE_LENGTH(0x20)
- MDRV_VIDEO_START(jantotsu)
- MDRV_VIDEO_UPDATE(jantotsu)
+ MCFG_VIDEO_START(jantotsu)
+ MCFG_VIDEO_UPDATE(jantotsu)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489A, 18432000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76489A, 18432000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76489A, 18432000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76489A, 18432000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("adpcm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("adpcm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 158d3e31bd3..93493259cd6 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -657,35 +657,35 @@ static const ymz280b_interface ymz280b_intf =
static MACHINE_CONFIG_START( jchan, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(jchan_main)
- MDRV_CPU_VBLANK_INT_HACK(jchan_vblank, 224)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(jchan_main)
+ MCFG_CPU_VBLANK_INT_HACK(jchan_vblank, 224)
- MDRV_CPU_ADD("sub", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(jchan_sub)
+ MCFG_CPU_ADD("sub", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(jchan_sub)
- MDRV_GFXDECODE(jchan)
+ MCFG_GFXDECODE(jchan)
- 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, 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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x10000)
+ MCFG_PALETTE_LENGTH(0x10000)
- MDRV_VIDEO_START(jchan)
- MDRV_VIDEO_UPDATE(jchan)
+ MCFG_VIDEO_START(jchan)
+ MCFG_VIDEO_UPDATE(jchan)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 16000000)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16000000)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/* rom loading */
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index a3d4bf8d9b0..324da61fee8 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -345,20 +345,20 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( jedi, jedi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, JEDI_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502, JEDI_MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_QUANTUM_TIME(HZ(240))
+ MCFG_QUANTUM_TIME(HZ(240))
- MDRV_MACHINE_START(jedi)
- MDRV_MACHINE_RESET(jedi)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(jedi)
+ MCFG_MACHINE_RESET(jedi)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_FRAGMENT_ADD(jedi_video)
+ MCFG_FRAGMENT_ADD(jedi_video)
/* audio hardware */
- MDRV_FRAGMENT_ADD(jedi_audio)
+ MCFG_FRAGMENT_ADD(jedi_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c
index ed996910409..b8a559a9d0f 100644
--- a/src/mame/drivers/jokrwild.c
+++ b/src/mame/drivers/jokrwild.c
@@ -458,30 +458,30 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( jokrwild, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/2) /* guess */
- MDRV_CPU_PROGRAM_MAP(jokrwild_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/2) /* guess */
+ MCFG_CPU_PROGRAM_MAP(jokrwild_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", pia0_intf)
- MDRV_PIA6821_ADD("pia1", pia1_intf)
+ MCFG_PIA6821_ADD("pia0", pia0_intf)
+ MCFG_PIA6821_ADD("pia1", 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((32+1)*8, (32+1)*8) /* From MC6845, registers 00 & 04. (value-1) */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 24*8-1, 0*8, 26*8-1) /* From MC6845, registers 01 & 06 */
-
- MDRV_GFXDECODE(jokrwild)
- MDRV_PALETTE_INIT(jokrwild)
- MDRV_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(jokrwild)
- MDRV_VIDEO_UPDATE(jokrwild)
-
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */
+ 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+1)*8, (32+1)*8) /* From MC6845, registers 00 & 04. (value-1) */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 24*8-1, 0*8, 26*8-1) /* From MC6845, registers 01 & 06 */
+
+ MCFG_GFXDECODE(jokrwild)
+ MCFG_PALETTE_INIT(jokrwild)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_VIDEO_START(jokrwild)
+ MCFG_VIDEO_UPDATE(jokrwild)
+
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index ec6c51d0624..3e04e4b02ad 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -639,41 +639,41 @@ static MACHINE_RESET( jollyjgr )
static MACHINE_CONFIG_START( jollyjgr, jollyjgr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3579545) /* 3,579545 MHz */
- MDRV_CPU_PROGRAM_MAP(jollyjgr_map)
- MDRV_CPU_VBLANK_INT("screen", jollyjgr_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 3579545) /* 3,579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(jollyjgr_map)
+ MCFG_CPU_VBLANK_INT("screen", jollyjgr_interrupt)
- MDRV_MACHINE_START(jollyjgr)
- MDRV_MACHINE_RESET(jollyjgr)
+ MCFG_MACHINE_START(jollyjgr)
+ MCFG_MACHINE_RESET(jollyjgr)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(jollyjgr)
- MDRV_PALETTE_LENGTH(32+8) /* 32 for tilemap and sprites + 8 for the bitmap */
+ MCFG_GFXDECODE(jollyjgr)
+ MCFG_PALETTE_LENGTH(32+8) /* 32 for tilemap and sprites + 8 for the bitmap */
- MDRV_PALETTE_INIT(jollyjgr)
- MDRV_VIDEO_START(jollyjgr)
- MDRV_VIDEO_UPDATE(jollyjgr)
+ MCFG_PALETTE_INIT(jollyjgr)
+ MCFG_VIDEO_START(jollyjgr)
+ MCFG_VIDEO_UPDATE(jollyjgr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fspider, jollyjgr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fspider_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(fspider_map)
- MDRV_VIDEO_UPDATE(fspider)
+ MCFG_VIDEO_UPDATE(fspider)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index 37cfa7d79e4..3c0eb2c74fa 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -487,32 +487,32 @@ static MACHINE_RESET( jongkyo )
static MACHINE_CONFIG_START( jongkyo, jongkyo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,JONGKYO_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(jongkyo_memmap)
- MDRV_CPU_IO_MAP(jongkyo_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,JONGKYO_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(jongkyo_memmap)
+ MCFG_CPU_IO_MAP(jongkyo_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(jongkyo)
- MDRV_MACHINE_RESET(jongkyo)
+ MCFG_MACHINE_START(jongkyo)
+ MCFG_MACHINE_RESET(jongkyo)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 8, 256-8-1)
-
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(jongkyo)
-
- MDRV_VIDEO_START(jongkyo)
- MDRV_VIDEO_UPDATE(jongkyo)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, JONGKYO_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 8, 256-8-1)
+
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(jongkyo)
+
+ MCFG_VIDEO_START(jongkyo)
+ MCFG_VIDEO_UPDATE(jongkyo)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, JONGKYO_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 0dc1082813a..76b4316a61a 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -847,31 +847,31 @@ static const tms34010_config tms_config =
*************************************/
static MACHINE_CONFIG_START( jpmimpct, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(m68k_program_map)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(m68k_program_map)
- MDRV_CPU_ADD("dsp", TMS34010, 40000000)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_program_map)
+ MCFG_CPU_ADD("dsp", TMS34010, 40000000)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(tms_program_map)
- MDRV_QUANTUM_TIME(HZ(30000))
- MDRV_MACHINE_START(jpmimpct)
- MDRV_MACHINE_RESET(jpmimpct)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_QUANTUM_TIME(HZ(30000))
+ MCFG_MACHINE_START(jpmimpct)
+ MCFG_MACHINE_RESET(jpmimpct)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_TIMER_ADD( "duart_1_timer", duart_1_timer_event)
+ MCFG_TIMER_ADD( "duart_1_timer", duart_1_timer_event)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(40000000/4, 156*4, 0, 100*4, 328, 0, 300)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(40000000/4, 156*4, 0, 100*4, 328, 0, 300)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_VIDEO_START(jpmimpct)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(jpmimpct)
+ MCFG_VIDEO_UPDATE(tms340x0)
MACHINE_CONFIG_END
@@ -1323,23 +1323,23 @@ ADDRESS_MAP_END
*************************************/
static MACHINE_CONFIG_START( impctawp, driver_device )
- MDRV_CPU_ADD("maincpu",M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(awp68k_program_map)
+ MCFG_CPU_ADD("maincpu",M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(awp68k_program_map)
- MDRV_QUANTUM_TIME(HZ(30000))
+ MCFG_QUANTUM_TIME(HZ(30000))
- MDRV_MACHINE_START(impctawp)
- MDRV_MACHINE_RESET(impctawp)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(impctawp)
+ MCFG_MACHINE_RESET(impctawp)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_TIMER_ADD( "duart_1_timer", duart_1_timer_event)
+ MCFG_TIMER_ADD( "duart_1_timer", duart_1_timer_event)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_DEFAULT_LAYOUT(layout_awpvid16)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index 1a448165214..b46ca8fd6c0 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -596,38 +596,38 @@ static MACHINE_RESET( jpmsys5v )
*************************************/
static MACHINE_CONFIG_START( jpmsys5v, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(68000_map)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(68000_map)
- MDRV_ACIA6850_ADD("acia6850_0", acia0_if)
- MDRV_ACIA6850_ADD("acia6850_1", acia1_if)
- MDRV_ACIA6850_ADD("acia6850_2", acia2_if)
+ MCFG_ACIA6850_ADD("acia6850_0", acia0_if)
+ MCFG_ACIA6850_ADD("acia6850_1", acia1_if)
+ MCFG_ACIA6850_ADD("acia6850_2", acia2_if)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(jpmsys5v)
- MDRV_MACHINE_RESET(jpmsys5v)
+ MCFG_MACHINE_START(jpmsys5v)
+ MCFG_MACHINE_RESET(jpmsys5v)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(XTAL_40MHz / 4, 676, 20*4, 147*4, 256, 0, 254)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz / 4, 676, 20*4, 147*4, 256, 0, 254)
- MDRV_VIDEO_START(jpmsys5v)
- MDRV_VIDEO_UPDATE(jpmsys5v)
+ MCFG_VIDEO_START(jpmsys5v)
+ MCFG_VIDEO_UPDATE(jpmsys5v)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("upd7759", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("upd7759", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
/* Earlier revisions use an SAA1099 */
- MDRV_SOUND_ADD("ym2413", YM2413, 4000000 ) /* Unconfirmed */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ym2413", YM2413, 4000000 ) /* Unconfirmed */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* 6840 PTM */
- MDRV_PTM6840_ADD("6840ptm", ptm_intf)
+ MCFG_PTM6840_ADD("6840ptm", ptm_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index e39fdb3149c..4c82fd9dcde 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -266,32 +266,32 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( jrpacman, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(jrpacman)
- MDRV_PALETTE_LENGTH(128*4)
+ MCFG_GFXDECODE(jrpacman)
+ MCFG_PALETTE_LENGTH(128*4)
- MDRV_PALETTE_INIT(pacman)
- MDRV_VIDEO_START(jrpacman)
- MDRV_VIDEO_UPDATE(pacman)
+ MCFG_PALETTE_INIT(pacman)
+ MCFG_VIDEO_START(jrpacman)
+ MCFG_VIDEO_UPDATE(pacman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, 3072000/32)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO, 3072000/32)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c
index 0881e77f9a7..bf5e0f5861c 100644
--- a/src/mame/drivers/jubilee.c
+++ b/src/mame/drivers/jubilee.c
@@ -400,28 +400,28 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( jubileep, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS9980, MASTER_CLOCK/2) /* guess */
- MDRV_CPU_PROGRAM_MAP(jubileep_map)
- MDRV_CPU_IO_MAP(jubileep_cru_map)
- MDRV_CPU_VBLANK_INT("screen", jubileep_interrupt)
+ MCFG_CPU_ADD("maincpu", TMS9980, MASTER_CLOCK/2) /* guess */
+ MCFG_CPU_PROGRAM_MAP(jubileep_map)
+ MCFG_CPU_IO_MAP(jubileep_cru_map)
+ MCFG_CPU_VBLANK_INT("screen", jubileep_interrupt)
/* 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, 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(jubileep)
+ MCFG_GFXDECODE(jubileep)
- MDRV_PALETTE_INIT(jubileep)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(jubileep)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(jubileep)
- MDRV_VIDEO_UPDATE(jubileep)
+ MCFG_VIDEO_START(jubileep)
+ MCFG_VIDEO_UPDATE(jubileep)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/4, mc6845_intf) /* guess */
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/4, mc6845_intf) /* guess */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index ebc498406a2..8458a361af9 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -403,48 +403,48 @@ static MACHINE_RESET( junofrst )
static MACHINE_CONFIG_START( junofrst, junofrst_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_ADD("mcu", I8039,8000000) /* 8MHz crystal */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
- MDRV_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_ADD("mcu", I8039,8000000) /* 8MHz crystal */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_IO_MAP(mcu_io_map)
- MDRV_MACHINE_START(junofrst)
- MDRV_MACHINE_RESET(junofrst)
+ MCFG_MACHINE_START(junofrst)
+ MCFG_MACHINE_RESET(junofrst)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* not sure about the visible area */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* not sure about the visible area */
- MDRV_VIDEO_UPDATE(tutankhm)
+ MCFG_VIDEO_UPDATE(tutankhm)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(0, "filter.0.0", 0.30)
- MDRV_SOUND_ROUTE(1, "filter.0.1", 0.30)
- MDRV_SOUND_ROUTE(2, "filter.0.2", 0.30)
-
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- 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)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("aysnd", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(0, "filter.0.0", 0.30)
+ MCFG_SOUND_ROUTE(1, "filter.0.1", 0.30)
+ MCFG_SOUND_ROUTE(2, "filter.0.2", 0.30)
+
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ 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)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 23d8acd03ac..88c4dda6cd1 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -1802,42 +1802,42 @@ static const ay8910_interface ay8910_intf_eeprom =
static MACHINE_CONFIG_START( berlwall, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12 */
- MDRV_CPU_PROGRAM_MAP(berlwall)
- MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12 */
+ MCFG_CPU_PROGRAM_MAP(berlwall)
+ MCFG_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
- MDRV_MACHINE_RESET(berlwall)
+ MCFG_MACHINE_RESET(berlwall)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) // mangled sprites otherwise
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) // mangled sprites otherwise
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
- MDRV_GFXDECODE(1x4bit_1x4bit)
- MDRV_PALETTE_LENGTH(2048 + 32768) /* 32768 static colors for the bg */
+ MCFG_GFXDECODE(1x4bit_1x4bit)
+ MCFG_PALETTE_LENGTH(2048 + 32768) /* 32768 static colors for the bg */
- MDRV_PALETTE_INIT(berlwall)
- MDRV_VIDEO_START(berlwall)
- MDRV_VIDEO_UPDATE(berlwall)
+ MCFG_PALETTE_INIT(berlwall)
+ MCFG_VIDEO_START(berlwall)
+ MCFG_VIDEO_UPDATE(berlwall)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ay1", YM2149, 1000000)
- MDRV_SOUND_CONFIG(ay8910_intf_dsw)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("ay1", YM2149, 1000000)
+ MCFG_SOUND_CONFIG(ay8910_intf_dsw)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("ay2", YM2149, 1000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ay2", YM2149, 1000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1848,41 +1848,41 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bakubrkr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bakubrkr)
- MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(bakubrkr)
+ MCFG_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
- MDRV_MACHINE_RESET(bakubrkr)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_RESET(bakubrkr)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) // mangled sprites otherwise
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) // mangled sprites otherwise
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
- MDRV_GFXDECODE(1x4bit_2x4bit)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(1x4bit_2x4bit)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(kaneko16_2xVIEW2)
- MDRV_VIDEO_UPDATE(kaneko16)
+ MCFG_VIDEO_START(kaneko16_2xVIEW2)
+ MCFG_VIDEO_UPDATE(kaneko16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", YM2149, XTAL_12MHz/6) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay1", YM2149, XTAL_12MHz/6) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ay2", YM2149, XTAL_12MHz/6) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_intf_eeprom)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay2", YM2149, XTAL_12MHz/6) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_intf_eeprom)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1903,38 +1903,38 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( blazeon, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000-12 */
- MDRV_CPU_PROGRAM_MAP(blazeon)
- MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000-12 */
+ MCFG_CPU_PROGRAM_MAP(blazeon)
+ MCFG_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
- MDRV_CPU_ADD("audiocpu", Z80,4000000) /* D780C-2 */
- MDRV_CPU_PROGRAM_MAP(blazeon_soundmem)
- MDRV_CPU_IO_MAP(blazeon_soundport)
+ MCFG_CPU_ADD("audiocpu", Z80,4000000) /* D780C-2 */
+ MCFG_CPU_PROGRAM_MAP(blazeon_soundmem)
+ MCFG_CPU_IO_MAP(blazeon_soundport)
- MDRV_MACHINE_RESET(blazeon)
+ MCFG_MACHINE_RESET(blazeon)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1 -8)
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1 -8)
- MDRV_GFXDECODE(1x4bit_1x4bit)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(1x4bit_1x4bit)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(kaneko16_1xVIEW2)
- MDRV_VIDEO_UPDATE(kaneko16)
+ MCFG_VIDEO_START(kaneko16_1xVIEW2)
+ MCFG_VIDEO_UPDATE(kaneko16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1956,36 +1956,36 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gtmr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("gtmr", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gtmr_map)
- MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("gtmr", M68000, XTAL_16MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(gtmr_map)
+ MCFG_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
- MDRV_MACHINE_RESET(gtmr)
+ MCFG_MACHINE_RESET(gtmr)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(1x8bit_2x4bit)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_GFXDECODE(1x8bit_2x4bit)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_VIDEO_START(kaneko16_2xVIEW2)
- MDRV_VIDEO_UPDATE(kaneko16)
+ MCFG_VIDEO_START(kaneko16_2xVIEW2)
+ MCFG_VIDEO_UPDATE(kaneko16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", XTAL_16MHz/8, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_OKIM6295_ADD("oki2", XTAL_16MHz/8, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
/***************************************************************************
@@ -1995,10 +1995,10 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bloodwar, gtmr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("gtmr")
- MDRV_CPU_PROGRAM_MAP(bloodwar)
+ MCFG_CPU_MODIFY("gtmr")
+ MCFG_CPU_PROGRAM_MAP(bloodwar)
- MDRV_MACHINE_RESET( bloodwar )
+ MCFG_MACHINE_RESET( bloodwar )
MACHINE_CONFIG_END
/***************************************************************************
@@ -2008,8 +2008,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gtmr2, gtmr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("gtmr")
- MDRV_CPU_PROGRAM_MAP(gtmr2_map)
+ MCFG_CPU_MODIFY("gtmr")
+ MCFG_CPU_PROGRAM_MAP(gtmr2_map)
MACHINE_CONFIG_END
/***************************************************************************
@@ -2029,11 +2029,11 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bonkadv, gtmr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("gtmr")
- MDRV_CPU_PROGRAM_MAP(bonkadv)
- MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM + 1 ) // comment above
+ MCFG_CPU_MODIFY("gtmr")
+ MCFG_CPU_PROGRAM_MAP(bonkadv)
+ MCFG_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM + 1 ) // comment above
- MDRV_MACHINE_RESET( bonkadv )
+ MCFG_MACHINE_RESET( bonkadv )
MACHINE_CONFIG_END
/***************************************************************************
@@ -2043,41 +2043,41 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mgcrystl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mgcrystl)
- MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mgcrystl)
+ MCFG_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
- MDRV_MACHINE_RESET(mgcrystl)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_RESET(mgcrystl)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(1x4bit_2x4bit)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(1x4bit_2x4bit)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(kaneko16_2xVIEW2)
- MDRV_VIDEO_UPDATE(kaneko16)
+ MCFG_VIDEO_START(kaneko16_2xVIEW2)
+ MCFG_VIDEO_UPDATE(kaneko16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", YM2149, XTAL_12MHz/6) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay1", YM2149, XTAL_12MHz/6) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ay2", YM2149, XTAL_12MHz/6) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_intf_eeprom)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay2", YM2149, XTAL_12MHz/6) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_intf_eeprom)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2161,38 +2161,38 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_START( shogwarr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(shogwarr)
- MDRV_CPU_VBLANK_INT_HACK(shogwarr_interrupt,SHOGWARR_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_PROGRAM_MAP(shogwarr)
+ MCFG_CPU_VBLANK_INT_HACK(shogwarr_interrupt,SHOGWARR_INTERRUPTS_NUM)
- MDRV_MACHINE_RESET(shogwarr)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DATA(shogwarr_default_eeprom, 128)
+ MCFG_MACHINE_RESET(shogwarr)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DATA(shogwarr_default_eeprom, 128)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.1854)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(40, 296-1, 16, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.1854)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(40, 296-1, 16, 240-1)
- MDRV_GFXDECODE(1x4bit_1x4bit)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(1x4bit_1x4bit)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(kaneko16_1xVIEW2)
- MDRV_VIDEO_UPDATE(kaneko16)
+ MCFG_VIDEO_START(kaneko16_1xVIEW2)
+ MCFG_VIDEO_UPDATE(kaneko16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", XTAL_16MHz/8, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_DEVICE_ADDRESS_MAP(0, shogwarr_oki1_map)
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_DEVICE_ADDRESS_MAP(0, shogwarr_oki1_map)
- MDRV_OKIM6295_ADD("oki2", XTAL_16MHz/8, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_DEVICE_ADDRESS_MAP(0, shogwarr_oki2_map)
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_DEVICE_ADDRESS_MAP(0, shogwarr_oki2_map)
MACHINE_CONFIG_END
@@ -2213,12 +2213,12 @@ static ADDRESS_MAP_START( brapboys_oki2_map, 0, 8 )
ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( brapboys, shogwarr )
- MDRV_SOUND_MODIFY("oki2")
- MDRV_DEVICE_ADDRESS_MAP(0, brapboys_oki2_map)
+ MCFG_SOUND_MODIFY("oki2")
+ MCFG_DEVICE_ADDRESS_MAP(0, brapboys_oki2_map)
- MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DATA(brapboys_default_eeprom, 128)
+ MCFG_DEVICE_REMOVE("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DATA(brapboys_default_eeprom, 128)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index 9d6ae178ef7..c5d915833e3 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -430,41 +430,41 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( nomcu, kangaroo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(kangaroo)
- MDRV_MACHINE_RESET(kangaroo)
+ MCFG_MACHINE_START(kangaroo)
+ MCFG_MACHINE_RESET(kangaroo)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK, 320*2, 0*2, 256*2, 260, 8, 248)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 320*2, 0*2, 256*2, 260, 8, 248)
- MDRV_VIDEO_START(kangaroo)
- MDRV_VIDEO_UPDATE(kangaroo)
+ MCFG_VIDEO_START(kangaroo)
+ MCFG_VIDEO_UPDATE(kangaroo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcu, nomcu )
- MDRV_MACHINE_START(kangaroo_mcu)
+ MCFG_MACHINE_START(kangaroo_mcu)
- MDRV_CPU_ADD("mcu", MB8841, MASTER_CLOCK/4/2)
- MDRV_DEVICE_DISABLE()
+ MCFG_CPU_ADD("mcu", MB8841, MASTER_CLOCK/4/2)
+ MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 02a2e1ce6c1..968badd5312 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -813,84 +813,84 @@ static MACHINE_RESET( karnov )
static MACHINE_CONFIG_START( karnov, karnov_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(karnov_map)
- MDRV_CPU_VBLANK_INT("screen", karnov_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(karnov_map)
+ MCFG_CPU_VBLANK_INT("screen", karnov_interrupt)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(karnov_sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(karnov_sound_map)
- MDRV_MACHINE_START(karnov)
- MDRV_MACHINE_RESET(karnov)
+ MCFG_MACHINE_START(karnov)
+ MCFG_MACHINE_RESET(karnov)
/* 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(2500) /* not accurate */)
- 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)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(karnov)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(karnov)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(karnov)
- MDRV_VIDEO_START(karnov)
- MDRV_VIDEO_UPDATE(karnov)
+ MCFG_PALETTE_INIT(karnov)
+ MCFG_VIDEO_START(karnov)
+ MCFG_VIDEO_UPDATE(karnov)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ym2", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wndrplnt, karnov_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(karnov_map)
- MDRV_CPU_VBLANK_INT("screen", karnov_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(karnov_map)
+ MCFG_CPU_VBLANK_INT("screen", karnov_interrupt)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(karnov_sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(karnov_sound_map)
- MDRV_MACHINE_START(karnov)
- MDRV_MACHINE_RESET(karnov)
+ MCFG_MACHINE_START(karnov)
+ MCFG_MACHINE_RESET(karnov)
/* 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(2500) /* not accurate */)
- 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)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(karnov)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(karnov)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(karnov)
- MDRV_VIDEO_START(wndrplnt)
- MDRV_VIDEO_UPDATE(karnov)
+ MCFG_PALETTE_INIT(karnov)
+ MCFG_VIDEO_START(wndrplnt)
+ MCFG_VIDEO_UPDATE(karnov)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ym2", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index a7eca2ea624..481c033e32c 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -421,46 +421,46 @@ static MACHINE_RESET( kchamp )
static MACHINE_CONFIG_START( kchampvs, kchamp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(kchampvs_map)
- MDRV_CPU_IO_MAP(kchampvs_io_map)
- MDRV_CPU_VBLANK_INT("screen", kc_interrupt)
-
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(kchampvs_sound_map)
- MDRV_CPU_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(kchampvs_map)
+ MCFG_CPU_IO_MAP(kchampvs_io_map)
+ MCFG_CPU_VBLANK_INT("screen", kc_interrupt)
+
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(kchampvs_sound_map)
+ MCFG_CPU_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
/* nmi's from msm5205 */
- MDRV_MACHINE_START(kchampvs)
- MDRV_MACHINE_RESET(kchamp)
+ MCFG_MACHINE_START(kchampvs)
+ MCFG_MACHINE_RESET(kchamp)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.10) /* verified on pcb */
- 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, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.10) /* verified on pcb */
+ 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, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(kchamp)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(kchamp)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(kchamp)
- MDRV_VIDEO_START(kchamp)
- MDRV_VIDEO_UPDATE(kchampvs)
+ MCFG_PALETTE_INIT(kchamp)
+ MCFG_VIDEO_START(kchamp)
+ MCFG_VIDEO_UPDATE(kchampvs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("msm", MSM5205, 375000) /* verified on pcb, discrete circuit clock */
- MDRV_SOUND_CONFIG(msm_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 375000) /* verified on pcb, discrete circuit clock */
+ MCFG_SOUND_CONFIG(msm_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/********************
@@ -470,47 +470,47 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kchamp, kchamp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kchamp_map)
- MDRV_CPU_IO_MAP(kchamp_io_map)
- MDRV_CPU_VBLANK_INT("screen", kc_interrupt)
-
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kchamp_sound_map)
- MDRV_CPU_IO_MAP(kchamp_sound_io_map)
- MDRV_CPU_PERIODIC_INT(sound_int, 125) /* Hz */
+ MCFG_CPU_ADD("maincpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(kchamp_map)
+ MCFG_CPU_IO_MAP(kchamp_io_map)
+ MCFG_CPU_VBLANK_INT("screen", kc_interrupt)
+
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(kchamp_sound_map)
+ MCFG_CPU_IO_MAP(kchamp_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(sound_int, 125) /* Hz */
/* irq's triggered from main cpu */
/* nmi's from 125 Hz clock */
- MDRV_MACHINE_START(kchamp)
- MDRV_MACHINE_RESET(kchamp)
+ MCFG_MACHINE_START(kchamp)
+ MCFG_MACHINE_RESET(kchamp)
/* 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, 32*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, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(kchamp)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(kchamp)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(kchamp)
- MDRV_VIDEO_START(kchamp)
- MDRV_VIDEO_UPDATE(kchamp)
+ MCFG_PALETTE_INIT(kchamp)
+ MCFG_VIDEO_START(kchamp)
+ MCFG_VIDEO_UPDATE(kchamp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) /* guess: using volume 0.50 makes the sound to clip a lot */
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) /* guess: using volume 0.50 makes the sound to clip a lot */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 7050fc9961f..b9279e7a2b7 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -675,78 +675,78 @@ static MACHINE_RESET( kickgoal )
static MACHINE_CONFIG_START( kickgoal, kickgoal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(kickgoal_program_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_PERIODIC_INT(kickgoal_interrupt, 240)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(kickgoal_program_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_PERIODIC_INT(kickgoal_interrupt, 240)
- MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000/4) /* 3MHz ? */
- MDRV_DEVICE_DISABLE() /* Disables since the internal rom isn't dumped */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000/4) /* 3MHz ? */
+ MCFG_DEVICE_DISABLE() /* Disables since the internal rom isn't dumped */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(kickgoal_sound_io_map)
+ MCFG_CPU_IO_MAP(kickgoal_sound_io_map)
- MDRV_MACHINE_START(kickgoal)
- MDRV_MACHINE_RESET(kickgoal)
+ MCFG_MACHINE_START(kickgoal)
+ MCFG_MACHINE_RESET(kickgoal)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DATA(kickgoal_default_eeprom_type1, 128)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DATA(kickgoal_default_eeprom_type1, 128)
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(9*8, 55*8-1, 4*8, 60*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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(9*8, 55*8-1, 4*8, 60*8-1)
- MDRV_GFXDECODE(kickgoal)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(kickgoal)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(kickgoal)
- MDRV_VIDEO_UPDATE(kickgoal)
+ MCFG_VIDEO_START(kickgoal)
+ MCFG_VIDEO_UPDATE(kickgoal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 12000000/8, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", 12000000/8, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( actionhw, kickgoal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(kickgoal_program_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(kickgoal_program_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", PIC16C57, XTAL_12MHz/3) /* verified on pcb */
- MDRV_DEVICE_DISABLE() /* Disables since the internal rom isn't dumped */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_12MHz/3) /* verified on pcb */
+ MCFG_DEVICE_DISABLE() /* Disables since the internal rom isn't dumped */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(actionhw_io_map)
+ MCFG_CPU_IO_MAP(actionhw_io_map)
- MDRV_MACHINE_START(kickgoal)
- MDRV_MACHINE_RESET(kickgoal)
+ MCFG_MACHINE_START(kickgoal)
+ MCFG_MACHINE_RESET(kickgoal)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DATA(kickgoal_default_eeprom_type1, 128)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DATA(kickgoal_default_eeprom_type1, 128)
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(10*8+2, 54*8-1+2, 0*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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(10*8+2, 54*8-1+2, 0*8, 30*8-1)
- MDRV_GFXDECODE(actionhw)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(actionhw)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(actionhw)
- MDRV_VIDEO_UPDATE(actionhw)
+ MCFG_VIDEO_START(actionhw)
+ MCFG_VIDEO_UPDATE(actionhw)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c
index 502fd98f5cb..ecbb2fb0b8e 100644
--- a/src/mame/drivers/kingdrby.c
+++ b/src/mame/drivers/kingdrby.c
@@ -967,77 +967,77 @@ static PALETTE_INIT(kingdrbb)
}
static MACHINE_CONFIG_START( kingdrby, driver_device )
- MDRV_CPU_ADD("master", Z80, CLK_2)
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_IO_MAP(master_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("master", Z80, CLK_2)
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_IO_MAP(master_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("slave", Z80, CLK_2)
- MDRV_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_IO_MAP(slave_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("slave", Z80, CLK_2)
+ MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_IO_MAP(slave_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, CLK_2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,1000) /* guess, controls ay8910 tempo.*/
+ MCFG_CPU_ADD("soundcpu", Z80, CLK_2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,1000) /* guess, controls ay8910 tempo.*/
- MDRV_QUANTUM_PERFECT_CPU("master")
+ MCFG_QUANTUM_PERFECT_CPU("master")
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- MDRV_GFXDECODE(kingdrby)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(kingdrby)
+ MCFG_GFXDECODE(kingdrby)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_INIT(kingdrby)
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1) /* controlled by CRTC */
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1) /* controlled by CRTC */
- MDRV_VIDEO_START(kingdrby)
- MDRV_VIDEO_UPDATE(kingdrby)
+ MCFG_VIDEO_START(kingdrby)
+ MCFG_VIDEO_UPDATE(kingdrby)
- MDRV_MC6845_ADD("crtc", MC6845, CLK_1/32, mc6845_intf) /* 53.333 Hz. guess */
+ MCFG_MC6845_ADD("crtc", MC6845, CLK_1/32, mc6845_intf) /* 53.333 Hz. guess */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, CLK_1/8) /* guess */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, CLK_1/8) /* guess */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kingdrbb, kingdrby )
- MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(slave_1986_map)
+ MCFG_CPU_MODIFY("slave")
+ MCFG_CPU_PROGRAM_MAP(slave_1986_map)
- MDRV_PALETTE_INIT(kingdrbb)
+ MCFG_PALETTE_INIT(kingdrbb)
- MDRV_PPI8255_RECONFIG( "ppi8255_0", ppi8255_1986_intf[0] )
- MDRV_PPI8255_RECONFIG( "ppi8255_1", ppi8255_1986_intf[1] )
+ MCFG_PPI8255_RECONFIG( "ppi8255_0", ppi8255_1986_intf[0] )
+ MCFG_PPI8255_RECONFIG( "ppi8255_1", ppi8255_1986_intf[1] )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cowrace, kingdrbb )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(cowrace_sound_map)
- MDRV_CPU_IO_MAP(cowrace_sound_io)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(cowrace_sound_map)
+ MCFG_CPU_IO_MAP(cowrace_sound_io)
- MDRV_GFXDECODE(cowrace)
- MDRV_PALETTE_INIT(kingdrby)
+ MCFG_GFXDECODE(cowrace)
+ MCFG_PALETTE_INIT(kingdrby)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_REPLACE("aysnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(cowrace_ym2203_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_REPLACE("aysnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(cowrace_ym2203_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
ROM_START( kingdrby )
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index 99dea992fa1..9f943f21ffa 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -477,52 +477,52 @@ static MACHINE_RESET( kingofb )
static MACHINE_CONFIG_START( kingofb, kingofb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_map)
- MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(kingobox_map)
+ MCFG_CPU_VBLANK_INT("screen", kingofb_interrupt)
- MDRV_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_video_map)
- MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
+ MCFG_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(kingobox_video_map)
+ MCFG_CPU_VBLANK_INT("screen", kingofb_interrupt)
- MDRV_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_sprite_map)
- MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
+ MCFG_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(kingobox_sprite_map)
+ MCFG_CPU_VBLANK_INT("screen", kingofb_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_sound_map)
- MDRV_CPU_IO_MAP(kingobox_sound_io_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 6000) /* Hz */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(kingobox_sound_map)
+ MCFG_CPU_IO_MAP(kingobox_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 6000) /* Hz */
- MDRV_QUANTUM_TIME(HZ(6000)) /* We really need heavy synching among the processors */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* We really need heavy synching among the processors */
- MDRV_MACHINE_START(kingofb)
- MDRV_MACHINE_RESET(kingofb)
+ MCFG_MACHINE_START(kingofb)
+ MCFG_MACHINE_RESET(kingofb)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(kingobox)
- MDRV_PALETTE_LENGTH(256+8*2)
+ MCFG_GFXDECODE(kingobox)
+ MCFG_PALETTE_LENGTH(256+8*2)
- MDRV_PALETTE_INIT(kingofb)
- MDRV_VIDEO_START(kingofb)
- MDRV_VIDEO_UPDATE(kingofb)
+ MCFG_PALETTE_INIT(kingofb)
+ MCFG_VIDEO_START(kingofb)
+ MCFG_VIDEO_UPDATE(kingofb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -530,52 +530,52 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ringking, kingofb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(ringking_map)
- MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(ringking_map)
+ MCFG_CPU_VBLANK_INT("screen", kingofb_interrupt)
- MDRV_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(ringking_video_map)
- MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
+ MCFG_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(ringking_video_map)
+ MCFG_CPU_VBLANK_INT("screen", kingofb_interrupt)
- MDRV_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(ringking_sprite_map)
- MDRV_CPU_VBLANK_INT("screen", kingofb_interrupt)
+ MCFG_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(ringking_sprite_map)
+ MCFG_CPU_VBLANK_INT("screen", kingofb_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
- MDRV_CPU_PROGRAM_MAP(kingobox_sound_map)
- MDRV_CPU_IO_MAP(ringking_sound_io_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 6000) /* Hz */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
+ MCFG_CPU_PROGRAM_MAP(kingobox_sound_map)
+ MCFG_CPU_IO_MAP(ringking_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 6000) /* Hz */
- MDRV_QUANTUM_TIME(HZ(6000)) /* We really need heavy synching among the processors */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* We really need heavy synching among the processors */
- MDRV_MACHINE_START(kingofb)
- MDRV_MACHINE_RESET(kingofb)
+ MCFG_MACHINE_START(kingofb)
+ MCFG_MACHINE_RESET(kingofb)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(rk)
- MDRV_PALETTE_LENGTH(256+8*2)
+ MCFG_GFXDECODE(rk)
+ MCFG_PALETTE_LENGTH(256+8*2)
- MDRV_PALETTE_INIT(ringking)
- MDRV_VIDEO_START(ringking)
- MDRV_VIDEO_UPDATE(ringking)
+ MCFG_PALETTE_INIT(ringking)
+ MCFG_VIDEO_START(ringking)
+ MCFG_VIDEO_UPDATE(ringking)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index 99876a011a7..21f1f0a8870 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -141,33 +141,33 @@ static const TMS9928a_interface tms9928a_interface =
static MACHINE_CONFIG_START( kingpin, driver_device )
/* MAIN CPU */
- MDRV_CPU_ADD("maincpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(kingpin_program_map)
- MDRV_CPU_IO_MAP(kingpin_io_map)
- MDRV_CPU_VBLANK_INT("screen", kingpin_video_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(kingpin_program_map)
+ MCFG_CPU_IO_MAP(kingpin_io_map)
+ MCFG_CPU_VBLANK_INT("screen", kingpin_video_interrupt)
/* SOUND CPU */
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(kingpin_sound_map)
- /*MDRV_CPU_IO_MAP(sound_io_map)*/
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(kingpin_sound_map)
+ /*MCFG_CPU_IO_MAP(sound_io_map)*/
/* VIDEO */
- MDRV_FRAGMENT_ADD(tms9928a)
+ MCFG_FRAGMENT_ADD(tms9928a)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* Sound chip is a AY-3-8912 */
/*
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8912, 1500000)
- MDRV_SOUND_CONFIG(ay8912_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8912, 1500000)
+ MCFG_SOUND_CONFIG(ay8912_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
*/
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c
index 0aef1abe858..26b49084b0c 100644
--- a/src/mame/drivers/kinst.c
+++ b/src/mame/drivers/kinst.c
@@ -639,33 +639,33 @@ static const mips3_config r4600_config =
static MACHINE_CONFIG_START( kinst, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R4600LE, MASTER_CLOCK*2)
- MDRV_CPU_CONFIG(r4600_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_start)
+ MCFG_CPU_ADD("maincpu", R4600LE, MASTER_CLOCK*2)
+ MCFG_CPU_CONFIG(r4600_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_start)
- MDRV_MACHINE_START(kinst)
- MDRV_MACHINE_RESET(kinst)
+ MCFG_MACHINE_START(kinst)
+ MCFG_MACHINE_RESET(kinst)
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_INIT(BBBBB_GGGGG_RRRRR)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(BBBBB_GGGGG_RRRRR)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_VIDEO_UPDATE(kinst)
+ MCFG_VIDEO_UPDATE(kinst)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dcs_audio_2k)
+ MCFG_FRAGMENT_ADD(dcs_audio_2k)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 8bddc9399da..c20968df2b0 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -167,33 +167,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( klax, klax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(klax_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(klax_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(klax)
- MDRV_MACHINE_RESET(klax)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(klax)
+ MCFG_MACHINE_RESET(klax)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(klax)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(klax)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(klax)
- MDRV_VIDEO_UPDATE(klax)
+ MCFG_VIDEO_START(klax)
+ MCFG_VIDEO_UPDATE(klax)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/4, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/4, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 9fc5d53e69c..c9872bd3ce0 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -275,47 +275,47 @@ static MACHINE_RESET( kncljoe )
static MACHINE_CONFIG_START( kncljoe, kncljoe_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_6MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("soundcpu", M6803, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(sound_nmi, (double)3970) //measured 3.970 kHz
+ MCFG_CPU_ADD("soundcpu", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(sound_nmi, (double)3970) //measured 3.970 kHz
- MDRV_MACHINE_START(kncljoe)
- MDRV_MACHINE_RESET(kncljoe)
+ MCFG_MACHINE_START(kncljoe)
+ MCFG_MACHINE_RESET(kncljoe)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1500))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1500))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(kncljoe)
- MDRV_PALETTE_LENGTH(16*8+16*8)
+ MCFG_GFXDECODE(kncljoe)
+ MCFG_PALETTE_LENGTH(16*8+16*8)
- MDRV_PALETTE_INIT(kncljoe)
- MDRV_VIDEO_START(kncljoe)
- MDRV_VIDEO_UPDATE(kncljoe)
+ MCFG_PALETTE_INIT(kncljoe)
+ MCFG_VIDEO_START(kncljoe)
+ MCFG_VIDEO_UPDATE(kncljoe)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("sn1", SN76489, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn1", SN76489, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("sn2", SN76489, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn2", SN76489, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c
index d698f8c5ad3..cbce1610a7e 100644
--- a/src/mame/drivers/koftball.c
+++ b/src/mame/drivers/koftball.c
@@ -203,29 +203,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( koftball, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 21477270/2 )
- MDRV_CPU_PROGRAM_MAP(koftball_mem)
- MDRV_CPU_VBLANK_INT_HACK(bmc_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000, 21477270/2 )
+ MCFG_CPU_PROGRAM_MAP(koftball_mem)
+ MCFG_CPU_VBLANK_INT_HACK(bmc_interrupt,3)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(koftball)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_GFXDECODE(koftball)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 30*8-1)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(koftball)
- MDRV_VIDEO_UPDATE(koftball)
+ MCFG_VIDEO_START(koftball)
+ MCFG_VIDEO_UPDATE(koftball)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_LOW) /* clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_LOW) /* clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
ROM_START( koftball )
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index 97e6c72e64f..fa6b746e074 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -358,35 +358,35 @@ static MACHINE_RESET( koikoi )
static MACHINE_CONFIG_START( koikoi, koikoi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,KOIKOI_CRYSTAL/4) /* ?? */
- MDRV_CPU_PROGRAM_MAP(koikoi_map)
- MDRV_CPU_IO_MAP(koikoi_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,KOIKOI_CRYSTAL/4) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(koikoi_map)
+ MCFG_CPU_IO_MAP(koikoi_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(koikoi)
- MDRV_MACHINE_RESET(koikoi)
+ MCFG_MACHINE_START(koikoi)
+ MCFG_MACHINE_RESET(koikoi)
/* 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, 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(koikoi)
- MDRV_PALETTE_LENGTH(8*32)
- MDRV_PALETTE_INIT(koikoi)
+ MCFG_GFXDECODE(koikoi)
+ MCFG_PALETTE_LENGTH(8*32)
+ MCFG_PALETTE_INIT(koikoi)
- MDRV_VIDEO_START(koikoi)
- MDRV_VIDEO_UPDATE(koikoi)
+ MCFG_VIDEO_START(koikoi)
+ MCFG_VIDEO_UPDATE(koikoi)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, KOIKOI_CRYSTAL/8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("aysnd", AY8910, KOIKOI_CRYSTAL/8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 4c1ea179970..128cef54fb4 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -382,45 +382,45 @@ static MACHINE_RESET( konamigq )
static MACHINE_CONFIG_START( konamigq, konamigq_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( konamigq_map)
- MDRV_CPU_VBLANK_INT("screen", psx_vblank)
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
+ MCFG_CPU_PROGRAM_MAP( konamigq_map)
+ MCFG_CPU_VBLANK_INT("screen", psx_vblank)
- MDRV_CPU_ADD( "soundcpu", M68000, 8000000 )
- MDRV_CPU_PROGRAM_MAP( konamigq_sound_map)
- MDRV_CPU_PERIODIC_INT( irq2_line_hold, 480 )
+ MCFG_CPU_ADD( "soundcpu", M68000, 8000000 )
+ MCFG_CPU_PROGRAM_MAP( konamigq_sound_map)
+ MCFG_CPU_PERIODIC_INT( irq2_line_hold, 480 )
- MDRV_MACHINE_START( konamigq )
- MDRV_MACHINE_RESET( konamigq )
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DATA(konamigq_def_eeprom, 128)
+ MCFG_MACHINE_START( konamigq )
+ MCFG_MACHINE_RESET( konamigq )
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DATA(konamigq_def_eeprom, 128)
/* 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( 1024, 1024 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ 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( 1024, 1024 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type1 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type1 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami1", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami1", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("konami2", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami2", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static INPUT_PORTS_START( konamigq )
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 4582d5d93a4..6d79f8b2352 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -345,40 +345,40 @@ static const psx_spu_interface konamigv_psxspu_interface =
static MACHINE_CONFIG_START( konamigv, konamigv_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( konamigv_map)
- MDRV_CPU_VBLANK_INT("screen", psx_vblank)
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
+ MCFG_CPU_PROGRAM_MAP( konamigv_map)
+ MCFG_CPU_VBLANK_INT("screen", psx_vblank)
- MDRV_MACHINE_START( konamigv )
- MDRV_MACHINE_RESET( konamigv )
+ MCFG_MACHINE_START( konamigv )
+ MCFG_MACHINE_RESET( konamigv )
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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( 1024, 512 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ 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( 1024, 512 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type2 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
- MDRV_SOUND_CONFIG( konamigv_psxspu_interface )
- MDRV_SOUND_ROUTE( 0, "lspeaker", 0.75 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 0.75 )
+ MCFG_SOUND_ADD( "spu", PSXSPU, 0 )
+ MCFG_SOUND_CONFIG( konamigv_psxspu_interface )
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 0.75 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 0.75 )
- MDRV_SOUND_ADD( "cdda", CDDA, 0 )
- MDRV_SOUND_ROUTE( 0, "lspeaker", 1.0 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 1.0 )
+ MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 1.0 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 1.0 )
MACHINE_CONFIG_END
@@ -553,10 +553,10 @@ static DRIVER_INIT( simpbowl )
}
static MACHINE_CONFIG_DERIVED( simpbowl, konamigv )
- MDRV_FUJITSU_29F016A_ADD("flash0")
- MDRV_FUJITSU_29F016A_ADD("flash1")
- MDRV_FUJITSU_29F016A_ADD("flash2")
- MDRV_FUJITSU_29F016A_ADD("flash3")
+ MCFG_FUJITSU_29F016A_ADD("flash0")
+ MCFG_FUJITSU_29F016A_ADD("flash1")
+ MCFG_FUJITSU_29F016A_ADD("flash2")
+ MCFG_FUJITSU_29F016A_ADD("flash3")
MACHINE_CONFIG_END
static INPUT_PORTS_START( simpbowl )
@@ -646,7 +646,7 @@ static DRIVER_INIT( btchamp )
}
static MACHINE_CONFIG_DERIVED( btchamp, konamigv )
- MDRV_SHARP_LH28F400_ADD("flash")
+ MCFG_SHARP_LH28F400_ADD("flash")
MACHINE_CONFIG_END
static INPUT_PORTS_START( btchamp )
@@ -738,7 +738,7 @@ static DRIVER_INIT( kdeadeye )
}
static MACHINE_CONFIG_DERIVED( kdeadeye, konamigv )
- MDRV_SHARP_LH28F400_ADD("flash")
+ MCFG_SHARP_LH28F400_ADD("flash")
MACHINE_CONFIG_END
static INPUT_PORTS_START( kdeadeye )
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 57e55193394..f888544d09b 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1787,180 +1787,180 @@ GFXDECODE_END
static MACHINE_CONFIG_START( konamigx, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 24000000)
- MDRV_CPU_PROGRAM_MAP(gx_type2_map)
- MDRV_CPU_VBLANK_INT("screen", konamigx_vbinterrupt)
+ MCFG_CPU_ADD("maincpu", M68EC020, 24000000)
+ MCFG_CPU_PROGRAM_MAP(gx_type2_map)
+ MCFG_CPU_VBLANK_INT("screen", konamigx_vbinterrupt)
- MDRV_CPU_ADD("soundcpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(gxsndmap)
- MDRV_CPU_PERIODIC_INT(irq2_line_hold, 480)
+ MCFG_CPU_ADD("soundcpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(gxsndmap)
+ MCFG_CPU_PERIODIC_INT(irq2_line_hold, 480)
- MDRV_CPU_ADD("dasp", TMS57002, 12500000)
- MDRV_CPU_DATA_MAP(gxtmsmap)
- MDRV_CPU_PERIODIC_INT(tms_sync, 48000)
+ MCFG_CPU_ADD("dasp", TMS57002, 12500000)
+ MCFG_CPU_DATA_MAP(gxtmsmap)
+ MCFG_CPU_PERIODIC_INT(tms_sync, 48000)
- MDRV_QUANTUM_TIME(HZ(1920))
+ MCFG_QUANTUM_TIME(HZ(1920))
- MDRV_MACHINE_START(konamigx)
- MDRV_MACHINE_RESET(konamigx)
+ MCFG_MACHINE_START(konamigx)
+ MCFG_MACHINE_RESET(konamigx)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
/* These parameters are actual value written to the CCU.
tbyahhoo attract mode desync is caused by another matter. */
-// MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(24, 24+288-1, 16, 16+224-1)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(24, 24+288-1, 16, 16+224-1)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(konamigx_5bpp)
- MDRV_VIDEO_UPDATE(konamigx)
+ MCFG_VIDEO_START(konamigx_5bpp)
+ MCFG_VIDEO_UPDATE(konamigx)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami1", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami1", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("konami2", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami2", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dragoonj, konamigx )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(26400000) // needs higher clock to stop sprite flickerings
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
- MDRV_VIDEO_START(dragoonj)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(26400000) // needs higher clock to stop sprite flickerings
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
+ MCFG_VIDEO_START(dragoonj)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( le2, konamigx )
- MDRV_VIDEO_START(le2)
+ MCFG_VIDEO_START(le2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( konamigx_6bpp, konamigx )
- MDRV_VIDEO_START(konamigx_6bpp)
+ MCFG_VIDEO_START(konamigx_6bpp)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( konamigx_6bpp_2, konamigx )
- MDRV_VIDEO_START(konamigx_6bpp_2)
+ MCFG_VIDEO_START(konamigx_6bpp_2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( opengolf, konamigx )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(8000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223)
- MDRV_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
- MDRV_GFXDECODE(opengolf)
- MDRV_VIDEO_START(opengolf)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(8000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223)
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
+ MCFG_GFXDECODE(opengolf)
+ MCFG_VIDEO_START(opengolf)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gx_type1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gx_type1_map)
- MDRV_ADC0834_ADD( "adc0834", konamigx_adc_interface )
+ MCFG_ADC0834_ADD( "adc0834", konamigx_adc_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( racinfrc, konamigx )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(8000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223)
- MDRV_SCREEN_VISIBLE_AREA(32, 32+384-1, 16, 16+224-1)
- MDRV_GFXDECODE(racinfrc)
- MDRV_VIDEO_START(racinfrc)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(8000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223)
+ MCFG_SCREEN_VISIBLE_AREA(32, 32+384-1, 16, 16+224-1)
+ MCFG_GFXDECODE(racinfrc)
+ MCFG_VIDEO_START(racinfrc)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gx_type1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gx_type1_map)
- MDRV_ADC0834_ADD( "adc0834", konamigx_adc_interface )
+ MCFG_ADC0834_ADD( "adc0834", konamigx_adc_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gxtype3, konamigx )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gx_type3_map)
- MDRV_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gx_type3_map)
+ MCFG_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(konamigx_type3)
- MDRV_PALETTE_LENGTH(16384)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(576, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
+ MCFG_VIDEO_START(konamigx_type3)
+ MCFG_PALETTE_LENGTH(16384)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(576, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
- MDRV_SCREEN_ADD("screen2", RASTER)
- MDRV_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(576, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
+ MCFG_SCREEN_ADD("screen2", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(576, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
- MDRV_GFXDECODE(type34)
+ MCFG_GFXDECODE(type34)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gxtype4, konamigx )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gx_type4_map)
- MDRV_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gx_type4_map)
+ MCFG_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(128*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 16, 32*8-1-16)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(128*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 32*8-1-16)
- MDRV_SCREEN_ADD("screen2", RASTER)
- MDRV_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(128*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 16, 32*8-1-16)
+ MCFG_SCREEN_ADD("screen2", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(128*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 32*8-1-16)
- MDRV_PALETTE_LENGTH(8192)
- MDRV_GFXDECODE(type4)
- MDRV_VIDEO_START(konamigx_type4)
+ MCFG_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(type4)
+ MCFG_VIDEO_START(konamigx_type4)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gxtype4_vsn, gxtype4 )
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(128*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(128*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
- MDRV_SCREEN_MODIFY("screen2")
- MDRV_SCREEN_SIZE(128*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
+ MCFG_SCREEN_MODIFY("screen2")
+ MCFG_SCREEN_SIZE(128*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 16, 32*8-1-16)
- MDRV_VIDEO_START(konamigx_type4_vsn)
+ MCFG_VIDEO_START(konamigx_type4_vsn)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gxtype4sd2, gxtype4 )
- MDRV_VIDEO_START(konamigx_type4_sd2)
+ MCFG_VIDEO_START(konamigx_type4_sd2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( winspike, konamigx )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(38, 38+384-1, 16, 16+224-1)
- MDRV_VIDEO_START(winspike)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(38, 38+384-1, 16, 16+224-1)
+ MCFG_VIDEO_START(winspike)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index e28d05f5346..9e13b34c05c 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -1133,28 +1133,28 @@ static INTERRUPT_GEN(m2)
static MACHINE_CONFIG_START( m2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC602, 33000000) /* actually PPC602, 66MHz */
- MDRV_CPU_CONFIG(ppc602_config)
- MDRV_CPU_PROGRAM_MAP(m2_main)
- MDRV_CPU_VBLANK_INT("screen", m2)
+ MCFG_CPU_ADD("maincpu", PPC602, 33000000) /* actually PPC602, 66MHz */
+ MCFG_CPU_CONFIG(ppc602_config)
+ MCFG_CPU_PROGRAM_MAP(m2_main)
+ MCFG_CPU_VBLANK_INT("screen", m2)
- MDRV_CPU_ADD("sub", PPC602, 33000000) /* actually PPC602, 66MHz */
- MDRV_CPU_CONFIG(ppc602_config)
- MDRV_CPU_PROGRAM_MAP(m2_main)
+ MCFG_CPU_ADD("sub", PPC602, 33000000) /* actually PPC602, 66MHz */
+ MCFG_CPU_CONFIG(ppc602_config)
+ MCFG_CPU_PROGRAM_MAP(m2_main)
/* 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
-
- MDRV_PALETTE_LENGTH(32768)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
-
- MDRV_VIDEO_START(m2)
- MDRV_VIDEO_UPDATE(m2)
+ 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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+
+ MCFG_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+
+ MCFG_VIDEO_START(m2)
+ MCFG_VIDEO_UPDATE(m2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kongambl.c b/src/mame/drivers/kongambl.c
index 4b9081e18b3..031a8c990f5 100644
--- a/src/mame/drivers/kongambl.c
+++ b/src/mame/drivers/kongambl.c
@@ -127,30 +127,30 @@ static const k053247_interface k053247_intf =
};
static MACHINE_CONFIG_START( kongambl, driver_device )
- MDRV_CPU_ADD("maincpu", M68EC020, 25000000)
- MDRV_CPU_PROGRAM_MAP(kongambl_map)
+ MCFG_CPU_ADD("maincpu", M68EC020, 25000000)
+ MCFG_CPU_PROGRAM_MAP(kongambl_map)
- MDRV_CPU_ADD("sndcpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(kongamaud_map)
+ MCFG_CPU_ADD("sndcpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(kongamaud_map)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- 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, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(kongambl)
- MDRV_VIDEO_UPDATE(kongambl)
+ MCFG_VIDEO_START(kongambl)
+ MCFG_VIDEO_UPDATE(kongambl)
- MDRV_K053247_ADD("k053246", k053247_intf)
- MDRV_K056832_ADD("k056832", k056832_intf)
+ MCFG_K053247_ADD("k053246", k053247_intf)
+ MCFG_K056832_ADD("k056832", k056832_intf)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index 557669d246e..f23f84a4b40 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -190,28 +190,28 @@ static MACHINE_RESET( kopunch )
static MACHINE_CONFIG_START( kopunch, kopunch_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8085A, 4000000) /* 4 MHz ???? Uses SIM, must be 8085 */
- MDRV_CPU_PROGRAM_MAP(kopunch_map)
- MDRV_CPU_IO_MAP(kopunch_io_map)
- MDRV_CPU_VBLANK_INT("screen",kopunch_interrupt)
+ MCFG_CPU_ADD("maincpu", I8085A, 4000000) /* 4 MHz ???? Uses SIM, must be 8085 */
+ MCFG_CPU_PROGRAM_MAP(kopunch_map)
+ MCFG_CPU_IO_MAP(kopunch_io_map)
+ MCFG_CPU_VBLANK_INT("screen",kopunch_interrupt)
- MDRV_MACHINE_START(kopunch)
- MDRV_MACHINE_RESET(kopunch)
+ MCFG_MACHINE_START(kopunch)
+ MCFG_MACHINE_RESET(kopunch)
/* 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, 1*8, 31*8-1)
-
- MDRV_GFXDECODE(kopunch)
- MDRV_PALETTE_LENGTH(8)
-
- MDRV_PALETTE_INIT(kopunch)
- MDRV_VIDEO_START(kopunch)
- MDRV_VIDEO_UPDATE(kopunch)
+ 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, 1*8, 31*8-1)
+
+ MCFG_GFXDECODE(kopunch)
+ MCFG_PALETTE_LENGTH(8)
+
+ MCFG_PALETTE_INIT(kopunch)
+ MCFG_VIDEO_START(kopunch)
+ MCFG_VIDEO_UPDATE(kopunch)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 9244342bb60..4d688e2ab9c 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -274,47 +274,47 @@ static MACHINE_RESET( ksayakyu )
static MACHINE_CONFIG_START( ksayakyu, ksayakyu_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,MAIN_CLOCK/8) //divider is guessed
- MDRV_CPU_PROGRAM_MAP(maincpu_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/8) //divider is guessed
+ MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, MAIN_CLOCK/8) //divider is guessed, controls DAC tempo
- MDRV_CPU_PROGRAM_MAP(soundcpu_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,60) //guess, controls music tempo
+ MCFG_CPU_ADD("audiocpu", Z80, MAIN_CLOCK/8) //divider is guessed, controls DAC tempo
+ MCFG_CPU_PROGRAM_MAP(soundcpu_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,60) //guess, controls music tempo
- MDRV_QUANTUM_TIME(HZ(60000))
+ MCFG_QUANTUM_TIME(HZ(60000))
- MDRV_MACHINE_START(ksayakyu)
- MDRV_MACHINE_RESET(ksayakyu)
+ MCFG_MACHINE_START(ksayakyu)
+ MCFG_MACHINE_RESET(ksayakyu)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(ksayakyu)
- MDRV_PALETTE_INIT(ksayakyu)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(ksayakyu)
+ MCFG_PALETTE_INIT(ksayakyu)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(ksayakyu)
- MDRV_VIDEO_UPDATE(ksayakyu)
+ MCFG_VIDEO_START(ksayakyu)
+ MCFG_VIDEO_UPDATE(ksayakyu)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/16) //unknown clock
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/16) //unknown clock
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/16) //unknown clock
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/16) //unknown clock
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- 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
ROM_START( ksayakyu )
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index cb0853c9e8b..66b9528e638 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -2926,99 +2926,99 @@ static const adc083x_interface konami573_adc_interface = {
static MACHINE_CONFIG_START( konami573, ksys573_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( konami573_map)
- MDRV_CPU_VBLANK_INT("screen", sys573_vblank)
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
+ MCFG_CPU_PROGRAM_MAP( konami573_map)
+ MCFG_CPU_VBLANK_INT("screen", sys573_vblank)
- MDRV_MACHINE_RESET( konami573 )
- MDRV_NVRAM_HANDLER( konami573 )
+ MCFG_MACHINE_RESET( konami573 )
+ MCFG_NVRAM_HANDLER( konami573 )
// onboard flash
- MDRV_FUJITSU_29F016A_ADD("onboard.0")
- MDRV_FUJITSU_29F016A_ADD("onboard.1")
- MDRV_FUJITSU_29F016A_ADD("onboard.2")
- MDRV_FUJITSU_29F016A_ADD("onboard.3")
- MDRV_FUJITSU_29F016A_ADD("onboard.4")
- MDRV_FUJITSU_29F016A_ADD("onboard.5")
- MDRV_FUJITSU_29F016A_ADD("onboard.6")
- MDRV_FUJITSU_29F016A_ADD("onboard.7")
+ MCFG_FUJITSU_29F016A_ADD("onboard.0")
+ MCFG_FUJITSU_29F016A_ADD("onboard.1")
+ MCFG_FUJITSU_29F016A_ADD("onboard.2")
+ MCFG_FUJITSU_29F016A_ADD("onboard.3")
+ MCFG_FUJITSU_29F016A_ADD("onboard.4")
+ MCFG_FUJITSU_29F016A_ADD("onboard.5")
+ MCFG_FUJITSU_29F016A_ADD("onboard.6")
+ MCFG_FUJITSU_29F016A_ADD("onboard.7")
/* 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( 1024, 1024 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ 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( 1024, 1024 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type2 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
- MDRV_SOUND_CONFIG( konami573_psxspu_interface )
- MDRV_SOUND_ROUTE( 0, "lspeaker", 1.0 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 1.0 )
+ MCFG_SOUND_ADD( "spu", PSXSPU, 0 )
+ MCFG_SOUND_CONFIG( konami573_psxspu_interface )
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 1.0 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 1.0 )
- MDRV_SOUND_ADD( "cdda", CDDA, 0 )
- MDRV_SOUND_ROUTE( 0, "lspeaker", 1.0 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 1.0 )
+ MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 1.0 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 1.0 )
- MDRV_M48T58_ADD( "m48t58" )
+ MCFG_M48T58_ADD( "m48t58" )
- MDRV_ADC0834_ADD( "adc0834", konami573_adc_interface )
+ MCFG_ADC0834_ADD( "adc0834", konami573_adc_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pccard1, konami573 )
// flash for pccard 1
- MDRV_FUJITSU_29F016A_ADD("pccard1.0")
- MDRV_FUJITSU_29F016A_ADD("pccard1.1")
- MDRV_FUJITSU_29F016A_ADD("pccard1.2")
- MDRV_FUJITSU_29F016A_ADD("pccard1.3")
- MDRV_FUJITSU_29F016A_ADD("pccard1.4")
- MDRV_FUJITSU_29F016A_ADD("pccard1.5")
- MDRV_FUJITSU_29F016A_ADD("pccard1.6")
- MDRV_FUJITSU_29F016A_ADD("pccard1.7")
- MDRV_FUJITSU_29F016A_ADD("pccard1.8")
- MDRV_FUJITSU_29F016A_ADD("pccard1.9")
- MDRV_FUJITSU_29F016A_ADD("pccard1.10")
- MDRV_FUJITSU_29F016A_ADD("pccard1.11")
- MDRV_FUJITSU_29F016A_ADD("pccard1.12")
- MDRV_FUJITSU_29F016A_ADD("pccard1.13")
- MDRV_FUJITSU_29F016A_ADD("pccard1.14")
- MDRV_FUJITSU_29F016A_ADD("pccard1.15")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.0")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.1")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.2")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.3")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.4")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.5")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.6")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.7")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.8")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.9")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.10")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.11")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.12")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.13")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.14")
+ MCFG_FUJITSU_29F016A_ADD("pccard1.15")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pccard2, konami573 )
// flash for pccard 2
- MDRV_FUJITSU_29F016A_ADD("pccard2.0")
- MDRV_FUJITSU_29F016A_ADD("pccard2.1")
- MDRV_FUJITSU_29F016A_ADD("pccard2.2")
- MDRV_FUJITSU_29F016A_ADD("pccard2.3")
- MDRV_FUJITSU_29F016A_ADD("pccard2.4")
- MDRV_FUJITSU_29F016A_ADD("pccard2.5")
- MDRV_FUJITSU_29F016A_ADD("pccard2.6")
- MDRV_FUJITSU_29F016A_ADD("pccard2.7")
- MDRV_FUJITSU_29F016A_ADD("pccard2.8")
- MDRV_FUJITSU_29F016A_ADD("pccard2.9")
- MDRV_FUJITSU_29F016A_ADD("pccard2.10")
- MDRV_FUJITSU_29F016A_ADD("pccard2.11")
- MDRV_FUJITSU_29F016A_ADD("pccard2.12")
- MDRV_FUJITSU_29F016A_ADD("pccard2.13")
- MDRV_FUJITSU_29F016A_ADD("pccard2.14")
- MDRV_FUJITSU_29F016A_ADD("pccard2.15")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.0")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.1")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.2")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.3")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.4")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.5")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.6")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.7")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.8")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.9")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.10")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.11")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.12")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.13")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.14")
+ MCFG_FUJITSU_29F016A_ADD("pccard2.15")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( k573bait, konami573 )
/* Additional NEC Encoder */
- MDRV_UPD4701_ADD( "upd4701" )
+ MCFG_UPD4701_ADD( "upd4701" )
MACHINE_CONFIG_END
static INPUT_PORTS_START( konami573 )
diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c
index 4ffbc479e23..8cb7549fd69 100644
--- a/src/mame/drivers/kungfur.c
+++ b/src/mame/drivers/kungfur.c
@@ -336,36 +336,36 @@ static INTERRUPT_GEN( kungfur_irq )
static MACHINE_CONFIG_START( kungfur, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M6809,8000000/2)
- MDRV_CPU_PROGRAM_MAP(kungfur_map)
- MDRV_CPU_VBLANK_INT("screen",kungfur_irq)
+ MCFG_CPU_ADD("maincpu",M6809,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(kungfur_map)
+ MCFG_CPU_VBLANK_INT("screen",kungfur_irq)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- MDRV_MACHINE_RESET( kungfur )
+ MCFG_MACHINE_RESET( kungfur )
/* 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_PALETTE_LENGTH(512)
+ 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_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(kungfur)
- MDRV_VIDEO_UPDATE(kungfur)
+ MCFG_VIDEO_START(kungfur)
+ MCFG_VIDEO_UPDATE(kungfur)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("adpcm1", MSM5205, 400000)
- MDRV_SOUND_CONFIG(msm5205_config_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("adpcm2", MSM5205, 400000)
- MDRV_SOUND_CONFIG(msm5205_config_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("adpcm1", MSM5205, 400000)
+ MCFG_SOUND_CONFIG(msm5205_config_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("adpcm2", MSM5205, 400000)
+ MCFG_SOUND_CONFIG(msm5205_config_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index bfb6c1bf173..6161d8c31ef 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -482,90 +482,90 @@ static MACHINE_RESET( kyugo )
static MACHINE_CONFIG_START( gyrodine, kyugo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(gyrodine_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(gyrodine_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(gyrodine_sub_map)
- MDRV_CPU_IO_MAP(gyrodine_sub_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
+ MCFG_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(gyrodine_sub_map)
+ MCFG_CPU_IO_MAP(gyrodine_sub_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(kyugo)
- MDRV_MACHINE_RESET(kyugo)
+ MCFG_MACHINE_START(kyugo)
+ MCFG_MACHINE_RESET(kyugo)
/* 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(0*8, 36*8-1, 2*8, 30*8-1)
+ 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(0*8, 36*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(kyugo)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(kyugo)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(kyugo)
- MDRV_VIDEO_UPDATE(kyugo)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(kyugo)
+ MCFG_VIDEO_UPDATE(kyugo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( repulse, gyrodine )
/* basic machine hardware */
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(repulse_sub_map)
- MDRV_CPU_IO_MAP(repulse_sub_portmap)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(repulse_sub_map)
+ MCFG_CPU_IO_MAP(repulse_sub_portmap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( srdmissn, gyrodine )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(srdmissn_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(srdmissn_portmap)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(srdmissn_sub_map)
- MDRV_CPU_IO_MAP(srdmissn_sub_portmap)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(srdmissn_sub_map)
+ MCFG_CPU_IO_MAP(srdmissn_sub_portmap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( flashgal, repulse )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(flashgal_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(flashgal_portmap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( flashgala, gyrodine )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(flashgala_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(flashgala_portmap)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(flashgala_sub_map)
- MDRV_CPU_IO_MAP(flashgala_sub_portmap)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(flashgala_sub_map)
+ MCFG_CPU_IO_MAP(flashgala_sub_portmap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( legend, gyrodine )
/* basic machine hardware */
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(legend_sub_map)
- MDRV_CPU_IO_MAP(srdmissn_sub_portmap)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(legend_sub_map)
+ MCFG_CPU_IO_MAP(srdmissn_sub_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 0ee6442332e..51adb4c0337 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -196,46 +196,46 @@ static MACHINE_START( labyrunr )
static MACHINE_CONFIG_START( labyrunr, labyrunr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
- MDRV_CPU_PROGRAM_MAP(labyrunr_map)
- MDRV_CPU_VBLANK_INT_HACK(labyrunr_interrupt,8) /* 1 IRQ + 4 NMI (generated by 007121) */
+ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
+ MCFG_CPU_PROGRAM_MAP(labyrunr_map)
+ MCFG_CPU_VBLANK_INT_HACK(labyrunr_interrupt,8) /* 1 IRQ + 4 NMI (generated by 007121) */
- MDRV_MACHINE_START(labyrunr)
+ MCFG_MACHINE_START(labyrunr)
/* 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(37*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 35*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(37*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(labyrunr)
- MDRV_PALETTE_LENGTH(2*8*16*16)
+ MCFG_GFXDECODE(labyrunr)
+ MCFG_PALETTE_LENGTH(2*8*16*16)
- MDRV_PALETTE_INIT(labyrunr)
- MDRV_VIDEO_START(labyrunr)
- MDRV_VIDEO_UPDATE(labyrunr)
+ MCFG_PALETTE_INIT(labyrunr)
+ MCFG_VIDEO_START(labyrunr)
+ MCFG_VIDEO_UPDATE(labyrunr)
- MDRV_K007121_ADD("k007121")
- MDRV_K051733_ADD("k051733")
+ MCFG_K007121_ADD("k007121")
+ MCFG_K051733_ADD("k051733")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_interface_1)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ROUTE(2, "mono", 0.40)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
-
- MDRV_SOUND_ADD("ym2", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_interface_2)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ROUTE(2, "mono", 0.40)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_interface_1)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ROUTE(2, "mono", 0.40)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_interface_2)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ROUTE(2, "mono", 0.40)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 26bb6663728..7651226e7d3 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -776,85 +776,85 @@ static MACHINE_RESET( sraider )
static MACHINE_CONFIG_START( ladybug, ladybug_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(ladybug_map)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(ladybug_map)
- MDRV_MACHINE_START(ladybug)
+ MCFG_MACHINE_START(ladybug)
/* 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(1*8, 31*8-1, 4*8, 28*8-1)
+ 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(1*8, 31*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(ladybug)
- MDRV_PALETTE_LENGTH(4*8+4*16)
+ MCFG_GFXDECODE(ladybug)
+ MCFG_PALETTE_LENGTH(4*8+4*16)
- MDRV_PALETTE_INIT(ladybug)
- MDRV_VIDEO_START(ladybug)
- MDRV_VIDEO_UPDATE(ladybug)
+ MCFG_PALETTE_INIT(ladybug)
+ MCFG_VIDEO_START(ladybug)
+ MCFG_VIDEO_UPDATE(ladybug)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76489, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76489, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76489, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sraider, ladybug_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sraider_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sraider_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sraider_cpu2_map)
- MDRV_CPU_IO_MAP(sraider_cpu2_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sraider_cpu2_map)
+ MCFG_CPU_IO_MAP(sraider_cpu2_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(sraider)
- MDRV_MACHINE_RESET(sraider)
+ MCFG_MACHINE_START(sraider)
+ MCFG_MACHINE_RESET(sraider)
/* 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(1*8, 31*8-1, 4*8, 28*8-1)
+ 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(1*8, 31*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(sraider)
- MDRV_PALETTE_LENGTH(4*8+4*16+32+2)
+ MCFG_GFXDECODE(sraider)
+ MCFG_PALETTE_LENGTH(4*8+4*16+32+2)
- MDRV_PALETTE_INIT(sraider)
- MDRV_VIDEO_START(sraider)
- MDRV_VIDEO_UPDATE(sraider)
- MDRV_VIDEO_EOF(sraider)
+ MCFG_PALETTE_INIT(sraider)
+ MCFG_VIDEO_START(sraider)
+ MCFG_VIDEO_UPDATE(sraider)
+ MCFG_VIDEO_EOF(sraider)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76489, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76489, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76489, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn3", SN76489, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn3", SN76489, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn4", SN76489, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn4", SN76489, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn5", SN76489, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn5", SN76489, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 7253d998384..1337d563f6b 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -312,57 +312,57 @@ static MACHINE_RESET( ladyfrog )
static MACHINE_CONFIG_START( ladyfrog, ladyfrog_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(ladyfrog_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(ladyfrog_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(ladyfrog_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(ladyfrog_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_MACHINE_START(ladyfrog)
- MDRV_MACHINE_RESET(ladyfrog)
+ MCFG_MACHINE_START(ladyfrog)
+ MCFG_MACHINE_RESET(ladyfrog)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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, 29*8-1) // black borders in ladyfrog gameplay are correct
+ 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, 29*8-1) // black borders in ladyfrog gameplay are correct
- MDRV_GFXDECODE(ladyfrog)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(ladyfrog)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(ladyfrog)
- MDRV_VIDEO_UPDATE(ladyfrog)
+ MCFG_VIDEO_START(ladyfrog)
+ MCFG_VIDEO_UPDATE(ladyfrog)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( toucheme, ladyfrog )
- MDRV_VIDEO_START(toucheme)
+ MCFG_VIDEO_START(toucheme)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index 8bf7523fadb..1b6d6056b11 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -173,24 +173,24 @@ static MACHINE_RESET( laserbas )
static MACHINE_CONFIG_START( laserbas, laserbas_state )
- MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(laserbas_memory)
- MDRV_CPU_IO_MAP(laserbas_io)
- MDRV_CPU_VBLANK_INT_HACK(laserbas_interrupt,2)
-
- MDRV_MACHINE_START(laserbas)
- MDRV_MACHINE_RESET(laserbas)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
-
- MDRV_PALETTE_LENGTH(32)
- MDRV_VIDEO_START(laserbas)
- MDRV_VIDEO_UPDATE(laserbas)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(laserbas_memory)
+ MCFG_CPU_IO_MAP(laserbas_io)
+ MCFG_CPU_VBLANK_INT_HACK(laserbas_interrupt,2)
+
+ MCFG_MACHINE_START(laserbas)
+ MCFG_MACHINE_RESET(laserbas)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
+
+ MCFG_PALETTE_LENGTH(32)
+ MCFG_VIDEO_START(laserbas)
+ MCFG_VIDEO_UPDATE(laserbas)
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index a768340ab20..8e1cdfcf4a7 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -771,89 +771,89 @@ static MACHINE_RESET( laserbat )
static MACHINE_CONFIG_START( laserbat, laserbat_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, 14318180/4) // ???
- MDRV_CPU_PROGRAM_MAP(laserbat_map)
- MDRV_CPU_IO_MAP(laserbat_io_map)
- MDRV_CPU_VBLANK_INT("screen", laserbat_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650, 14318180/4) // ???
+ MCFG_CPU_PROGRAM_MAP(laserbat_map)
+ MCFG_CPU_IO_MAP(laserbat_io_map)
+ MCFG_CPU_VBLANK_INT("screen", laserbat_interrupt)
- MDRV_MACHINE_START(laserbat)
- MDRV_MACHINE_RESET(laserbat)
+ MCFG_MACHINE_START(laserbat)
+ MCFG_MACHINE_RESET(laserbat)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 29*8-1, 2*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 29*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(laserbat)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(laserbat)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_S2636_ADD("s2636_1", s2636_1_config)
- MDRV_S2636_ADD("s2636_2", s2636_2_config)
- MDRV_S2636_ADD("s2636_3", s2636_3_config)
+ MCFG_S2636_ADD("s2636_1", s2636_1_config)
+ MCFG_S2636_ADD("s2636_2", s2636_2_config)
+ MCFG_S2636_ADD("s2636_3", s2636_3_config)
- MDRV_VIDEO_START(laserbat)
- MDRV_VIDEO_UPDATE(laserbat)
+ MCFG_VIDEO_START(laserbat)
+ MCFG_VIDEO_UPDATE(laserbat)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0) // output not connected
- MDRV_SOUND_CONFIG(laserbat_sn76477_interface)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0) // output not connected
+ MCFG_SOUND_CONFIG(laserbat_sn76477_interface)
- MDRV_SOUND_ADD("tms1", TMS3615, 4000000/8/2) // 250 kHz, from second chip's clock out
- MDRV_SOUND_ROUTE(TMS3615_FOOTAGE_8, "mono", 1.0)
+ MCFG_SOUND_ADD("tms1", TMS3615, 4000000/8/2) // 250 kHz, from second chip's clock out
+ MCFG_SOUND_ROUTE(TMS3615_FOOTAGE_8, "mono", 1.0)
- MDRV_SOUND_ADD("tms2", TMS3615, 4000000/8) // 500 kHz
- MDRV_SOUND_ROUTE(TMS3615_FOOTAGE_8, "mono", 1.0)
+ MCFG_SOUND_ADD("tms2", TMS3615, 4000000/8) // 500 kHz
+ MCFG_SOUND_ROUTE(TMS3615_FOOTAGE_8, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( catnmous, laserbat_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, 14318000/4) /* ? */
- MDRV_CPU_PROGRAM_MAP(laserbat_map)
- MDRV_CPU_IO_MAP(catnmous_io_map)
- MDRV_CPU_VBLANK_INT("screen", laserbat_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650, 14318000/4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(laserbat_map)
+ MCFG_CPU_IO_MAP(catnmous_io_map)
+ MCFG_CPU_VBLANK_INT("screen", laserbat_interrupt)
- MDRV_CPU_ADD("audiocpu", M6802,3580000) /* ? */
- MDRV_CPU_PROGRAM_MAP(catnmous_sound_map)
- MDRV_CPU_PERIODIC_INT(zaccaria_cb1_toggle, (double)3580000/4096)
+ MCFG_CPU_ADD("audiocpu", M6802,3580000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(catnmous_sound_map)
+ MCFG_CPU_PERIODIC_INT(zaccaria_cb1_toggle, (double)3580000/4096)
- MDRV_PIA6821_ADD("pia", pia_intf)
+ MCFG_PIA6821_ADD("pia", pia_intf)
- MDRV_MACHINE_START(laserbat)
- MDRV_MACHINE_RESET(laserbat)
+ MCFG_MACHINE_START(laserbat)
+ MCFG_MACHINE_RESET(laserbat)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(laserbat)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(laserbat)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_S2636_ADD("s2636_1", s2636_1_config)
- MDRV_S2636_ADD("s2636_2", s2636_2_config)
- MDRV_S2636_ADD("s2636_3", s2636_3_config)
+ MCFG_S2636_ADD("s2636_1", s2636_1_config)
+ MCFG_S2636_ADD("s2636_2", s2636_2_config)
+ MCFG_S2636_ADD("s2636_3", s2636_3_config)
- MDRV_VIDEO_START(laserbat)
- MDRV_VIDEO_UPDATE(laserbat)
+ MCFG_VIDEO_START(laserbat)
+ MCFG_VIDEO_UPDATE(laserbat)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 3580000/2) // ?
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay1", AY8910, 3580000/2) // ?
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ay2", AY8910, 3580000/2) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay2", AY8910, 3580000/2) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index 4afb82fceb2..99351fc09ce 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -502,118 +502,118 @@ static MACHINE_RESET( wwjgtin )
static MACHINE_CONFIG_START( base, lasso_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 11289000/16) /* guess */
- MDRV_CPU_PROGRAM_MAP(lasso_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6502, 11289000/16) /* guess */
+ MCFG_CPU_PROGRAM_MAP(lasso_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", M6502, 600000)
- MDRV_CPU_PROGRAM_MAP(lasso_audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 600000)
+ MCFG_CPU_PROGRAM_MAP(lasso_audio_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(lasso)
- MDRV_MACHINE_RESET(lasso)
+ MCFG_MACHINE_START(lasso)
+ MCFG_MACHINE_RESET(lasso)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57) /* guess, but avoids glitching of Chameleon's high score table */
- 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(0, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57) /* guess, but avoids glitching of Chameleon's high score table */
+ 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(0, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(lasso)
- MDRV_PALETTE_LENGTH(0x40)
+ MCFG_GFXDECODE(lasso)
+ MCFG_PALETTE_LENGTH(0x40)
- MDRV_PALETTE_INIT(lasso)
- MDRV_VIDEO_START(lasso)
- MDRV_VIDEO_UPDATE(lasso)
+ MCFG_PALETTE_INIT(lasso)
+ MCFG_VIDEO_START(lasso)
+ MCFG_VIDEO_UPDATE(lasso)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn76489.1", SN76489, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn76489.1", SN76489, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn76489.2", SN76489, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn76489.2", SN76489, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lasso, base )
/* basic machine hardware */
- MDRV_CPU_ADD("blitter", M6502, 11289000/16) /* guess */
- MDRV_CPU_PROGRAM_MAP(lasso_coprocessor_map)
+ MCFG_CPU_ADD("blitter", M6502, 11289000/16) /* guess */
+ MCFG_CPU_PROGRAM_MAP(lasso_coprocessor_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( chameleo, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(chameleo_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(chameleo_main_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(chameleo_audio_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(chameleo_audio_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(chameleo)
+ MCFG_VIDEO_UPDATE(chameleo)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wwjgtin, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wwjgtin_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wwjgtin_main_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(wwjgtin_audio_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(wwjgtin_audio_map)
- MDRV_MACHINE_START(wwjgtin)
- MDRV_MACHINE_RESET(wwjgtin)
+ MCFG_MACHINE_START(wwjgtin)
+ MCFG_MACHINE_RESET(wwjgtin)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) // Smaller visible area?
- MDRV_GFXDECODE(wwjgtin) // Has 1 additional layer
- MDRV_PALETTE_LENGTH(0x40 + 16*16)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1) // Smaller visible area?
+ MCFG_GFXDECODE(wwjgtin) // Has 1 additional layer
+ MCFG_PALETTE_LENGTH(0x40 + 16*16)
- MDRV_PALETTE_INIT(wwjgtin)
- MDRV_VIDEO_START(wwjgtin)
- MDRV_VIDEO_UPDATE(wwjgtin)
+ MCFG_PALETTE_INIT(wwjgtin)
+ MCFG_VIDEO_START(wwjgtin)
+ MCFG_VIDEO_UPDATE(wwjgtin)
/* sound hardware */
- 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
static MACHINE_CONFIG_DERIVED( pinbo, base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pinbo_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pinbo_main_map)
- MDRV_CPU_REPLACE("audiocpu", Z80, 3000000)
- MDRV_CPU_PROGRAM_MAP(pinbo_audio_map)
- MDRV_CPU_IO_MAP(pinbo_audio_io_map)
+ MCFG_CPU_REPLACE("audiocpu", Z80, 3000000)
+ MCFG_CPU_PROGRAM_MAP(pinbo_audio_map)
+ MCFG_CPU_IO_MAP(pinbo_audio_io_map)
/* video hardware */
- MDRV_GFXDECODE(pinbo)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(pinbo)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(pinbo)
- MDRV_VIDEO_UPDATE(pinbo)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(pinbo)
+ MCFG_VIDEO_UPDATE(pinbo)
/* sound hardware */
- MDRV_DEVICE_REMOVE("sn76489.1")
- MDRV_DEVICE_REMOVE("sn76489.2")
+ MCFG_DEVICE_REMOVE("sn76489.1")
+ MCFG_DEVICE_REMOVE("sn76489.2")
- MDRV_SOUND_ADD("ay1", AY8910, 1250000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
+ MCFG_SOUND_ADD("ay1", AY8910, 1250000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
- MDRV_SOUND_ADD("ay2", AY8910, 1250000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
+ MCFG_SOUND_ADD("ay2", AY8910, 1250000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index 3a7d6acab72..08e2383b062 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -505,87 +505,87 @@ static MACHINE_RESET( lastduel )
static MACHINE_CONFIG_START( lastduel, lastduel_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* Could be 8 MHz */
- MDRV_CPU_PROGRAM_MAP(lastduel_map)
- MDRV_CPU_VBLANK_INT_HACK(lastduel_interrupt,3) /* 1 for vbl, 2 for control reads?? */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* Could be 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(lastduel_map)
+ MCFG_CPU_VBLANK_INT_HACK(lastduel_interrupt,3) /* 1 for vbl, 2 for control reads?? */
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(lastduel)
- MDRV_MACHINE_RESET(lastduel)
+ MCFG_MACHINE_START(lastduel)
+ MCFG_MACHINE_RESET(lastduel)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
- 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(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(lastduel)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(lastduel)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(lastduel)
- MDRV_VIDEO_EOF(lastduel)
- MDRV_VIDEO_UPDATE(lastduel)
+ MCFG_VIDEO_START(lastduel)
+ MCFG_VIDEO_EOF(lastduel)
+ MCFG_VIDEO_UPDATE(lastduel)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3579545)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, 3579545)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM2203, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym2", YM2203, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( madgear, lastduel_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* Accurate */
- MDRV_CPU_PROGRAM_MAP(madgear_map)
- MDRV_CPU_VBLANK_INT_HACK(madgear_interrupt,3) /* 1 for vbl, 2 for control reads?? */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* Accurate */
+ MCFG_CPU_PROGRAM_MAP(madgear_map)
+ MCFG_CPU_VBLANK_INT_HACK(madgear_interrupt,3) /* 1 for vbl, 2 for control reads?? */
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(madgear_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(madgear_sound_map)
- MDRV_MACHINE_START(madgear)
- MDRV_MACHINE_RESET(lastduel)
+ MCFG_MACHINE_START(madgear)
+ MCFG_MACHINE_RESET(lastduel)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
- 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(8*8, (64-8)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(madgear)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(madgear)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(madgear)
- MDRV_VIDEO_EOF(lastduel)
- MDRV_VIDEO_UPDATE(madgear)
+ MCFG_VIDEO_START(madgear)
+ MCFG_VIDEO_EOF(lastduel)
+ MCFG_VIDEO_UPDATE(madgear)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_OKIM6295_ADD("oki", XTAL_10MHz/10, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.98)
+ MCFG_OKIM6295_ADD("oki", XTAL_10MHz/10, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.98)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index fe6c52aa2b2..66eacb9f6ca 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -572,26 +572,26 @@ static MACHINE_RESET( lastfght )
static MACHINE_CONFIG_START( lastfght, lastfght_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H83044, 32000000/2)
- MDRV_CPU_PROGRAM_MAP( lastfght_map)
- MDRV_CPU_VBLANK_INT_HACK(unknown_interrupt,2)
+ MCFG_CPU_ADD("maincpu", H83044, 32000000/2)
+ MCFG_CPU_PROGRAM_MAP( lastfght_map)
+ MCFG_CPU_VBLANK_INT_HACK(unknown_interrupt,2)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(lastfght)
- MDRV_MACHINE_RESET(lastfght)
+ MCFG_MACHINE_START(lastfght)
+ MCFG_MACHINE_RESET(lastfght)
/* video hardware */
- MDRV_PALETTE_LENGTH( 256 )
+ MCFG_PALETTE_LENGTH( 256 )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE( 512, 256 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 )
- MDRV_SCREEN_REFRESH_RATE( 60 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE( 512, 256 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 512-1, 0, 256-16-1 )
+ MCFG_SCREEN_REFRESH_RATE( 60 )
- MDRV_VIDEO_START( lastfght )
- MDRV_VIDEO_UPDATE( lastfght )
+ MCFG_VIDEO_START( lastfght )
+ MCFG_VIDEO_UPDATE( lastfght )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 4778c4b6cb2..d14adb8f0fe 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -627,114 +627,114 @@ static MACHINE_RESET( lazercmd )
static MACHINE_CONFIG_START( lazercmd, lazercmd_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 672 kHz? */
+ MCFG_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 672 kHz? */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MDRV_CPU_PROGRAM_MAP(lazercmd_map)
- MDRV_CPU_IO_MAP(lazercmd_portmap)
- MDRV_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */
+ MCFG_CPU_PROGRAM_MAP(lazercmd_map)
+ MCFG_CPU_IO_MAP(lazercmd_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */
- MDRV_MACHINE_START(lazercmd)
- MDRV_MACHINE_RESET(lazercmd)
+ MCFG_MACHINE_START(lazercmd)
+ MCFG_MACHINE_RESET(lazercmd)
/* 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(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR)
- MDRV_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
+ 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(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR)
+ MCFG_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
0 * VERT_CHR, (VERT_RES - 1) * VERT_CHR - 1)
- MDRV_GFXDECODE(lazercmd)
- MDRV_PALETTE_LENGTH(5)
+ MCFG_GFXDECODE(lazercmd)
+ MCFG_PALETTE_LENGTH(5)
- MDRV_PALETTE_INIT(lazercmd)
- MDRV_VIDEO_UPDATE(lazercmd)
+ MCFG_PALETTE_INIT(lazercmd)
+ MCFG_VIDEO_UPDATE(lazercmd)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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
static MACHINE_CONFIG_START( medlanes, lazercmd_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 666 kHz */
+ MCFG_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 666 kHz */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MDRV_CPU_PROGRAM_MAP(medlanes_map)
- MDRV_CPU_IO_MAP(lazercmd_portmap)
- MDRV_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */
+ MCFG_CPU_PROGRAM_MAP(medlanes_map)
+ MCFG_CPU_IO_MAP(lazercmd_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */
- MDRV_MACHINE_START(lazercmd)
- MDRV_MACHINE_RESET(lazercmd)
+ MCFG_MACHINE_START(lazercmd)
+ MCFG_MACHINE_RESET(lazercmd)
/* 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(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR)
- MDRV_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
+ 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(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR)
+ MCFG_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
0 * VERT_CHR, VERT_RES * VERT_CHR - 1)
- MDRV_GFXDECODE(lazercmd)
- MDRV_PALETTE_LENGTH(5)
+ MCFG_GFXDECODE(lazercmd)
+ MCFG_PALETTE_LENGTH(5)
- MDRV_PALETTE_INIT(lazercmd)
- MDRV_VIDEO_UPDATE(lazercmd)
+ MCFG_PALETTE_INIT(lazercmd)
+ MCFG_VIDEO_UPDATE(lazercmd)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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
static MACHINE_CONFIG_START( bbonk, lazercmd_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 666 kHz */
+ MCFG_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 666 kHz */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MDRV_CPU_PROGRAM_MAP(bbonk_map)
- MDRV_CPU_IO_MAP(lazercmd_portmap)
- MDRV_CPU_VBLANK_INT_HACK(bbonk_timer, 128) /* 7680 Hz */
+ MCFG_CPU_PROGRAM_MAP(bbonk_map)
+ MCFG_CPU_IO_MAP(lazercmd_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(bbonk_timer, 128) /* 7680 Hz */
- MDRV_MACHINE_START(lazercmd)
- MDRV_MACHINE_RESET(lazercmd)
+ MCFG_MACHINE_START(lazercmd)
+ MCFG_MACHINE_RESET(lazercmd)
/* 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(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR)
- MDRV_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
+ 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(HORZ_RES * HORZ_CHR, VERT_RES * VERT_CHR)
+ MCFG_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
0 * VERT_CHR, (VERT_RES - 1) * VERT_CHR - 1)
- MDRV_GFXDECODE(lazercmd)
- MDRV_PALETTE_LENGTH(5)
+ MCFG_GFXDECODE(lazercmd)
+ MCFG_PALETTE_LENGTH(5)
- MDRV_PALETTE_INIT(lazercmd)
- MDRV_VIDEO_UPDATE(lazercmd)
+ MCFG_PALETTE_INIT(lazercmd)
+ MCFG_VIDEO_UPDATE(lazercmd)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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/legionna.c b/src/mame/drivers/legionna.c
index b627f4e4758..8dff8981643 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -1079,29 +1079,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( legionna, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(legionna_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(legionna_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- 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_GFXDECODE(legionna)
- MDRV_PALETTE_LENGTH(128*16)
+ MCFG_GFXDECODE(legionna)
+ MCFG_PALETTE_LENGTH(128*16)
- MDRV_VIDEO_START(legionna)
- MDRV_VIDEO_UPDATE(legionna)
+ MCFG_VIDEO_START(legionna)
+ MCFG_VIDEO_UPDATE(legionna)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000)
@@ -1111,29 +1111,29 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( heatbrl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(heatbrl_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(heatbrl_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- 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, 0*8, 32*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, 0*8, 32*8-1)
- MDRV_GFXDECODE(heatbrl)
- MDRV_PALETTE_LENGTH(128*16)
+ MCFG_GFXDECODE(heatbrl)
+ MCFG_PALETTE_LENGTH(128*16)
- MDRV_VIDEO_START(legionna)
- MDRV_VIDEO_UPDATE(legionna)
+ MCFG_VIDEO_START(legionna)
+ MCFG_VIDEO_UPDATE(legionna)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000)
@@ -1142,29 +1142,29 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( godzilla, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 20000000/2)
- MDRV_CPU_PROGRAM_MAP(godzilla_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
+ MCFG_CPU_PROGRAM_MAP(godzilla_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU2_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(61)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(61)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(heatbrl)
- MDRV_PALETTE_LENGTH(128*16)
+ MCFG_GFXDECODE(heatbrl)
+ MCFG_PALETTE_LENGTH(128*16)
- MDRV_VIDEO_START(legionna)
- MDRV_VIDEO_UPDATE(godzilla)
+ MCFG_VIDEO_START(legionna)
+ MCFG_VIDEO_UPDATE(godzilla)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(14318180/4,1320000)
@@ -1173,29 +1173,29 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( denjinmk, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 20000000/2)
- MDRV_CPU_PROGRAM_MAP(denjinmk_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
+ MCFG_CPU_PROGRAM_MAP(denjinmk_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU2_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_REFRESH_RATE(61)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_REFRESH_RATE(61)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(heatbrl)
- MDRV_PALETTE_LENGTH(128*16)
+ MCFG_GFXDECODE(heatbrl)
+ MCFG_PALETTE_LENGTH(128*16)
- MDRV_VIDEO_START(denjinmk)
- MDRV_VIDEO_UPDATE(godzilla)
+ MCFG_VIDEO_START(denjinmk)
+ MCFG_VIDEO_UPDATE(godzilla)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(14318180/4,1320000)
@@ -1204,29 +1204,29 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( grainbow, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 20000000/2)
- MDRV_CPU_PROGRAM_MAP(grainbow_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
+ MCFG_CPU_PROGRAM_MAP(grainbow_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
SEIBU2_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 42*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 42*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(grainbow)
- MDRV_PALETTE_LENGTH(128*16)
+ MCFG_GFXDECODE(grainbow)
+ MCFG_PALETTE_LENGTH(128*16)
- MDRV_VIDEO_START(grainbow)
- MDRV_VIDEO_UPDATE(grainbow)
+ MCFG_VIDEO_START(grainbow)
+ MCFG_VIDEO_UPDATE(grainbow)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(14318180/4,1320000)
@@ -1236,75 +1236,75 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cupsoc, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,20000000/2)
- MDRV_CPU_PROGRAM_MAP(cupsoc_mem)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000,20000000/2)
+ MCFG_CPU_PROGRAM_MAP(cupsoc_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(cupsoc)
- MDRV_PALETTE_LENGTH(128*16)
+ MCFG_GFXDECODE(cupsoc)
+ MCFG_PALETTE_LENGTH(128*16)
- MDRV_VIDEO_START(cupsoc)
- MDRV_VIDEO_UPDATE(grainbow)
+ MCFG_VIDEO_START(cupsoc)
+ MCFG_VIDEO_UPDATE(grainbow)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cupsocs, cupsoc )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cupsocs_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cupsocs_mem)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cupsocbl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(cupsocbl_mem)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold) /* VBL */
+ MCFG_CPU_ADD("maincpu", M68000,12000000)
+ MCFG_CPU_PROGRAM_MAP(cupsocbl_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) /* VBL */
/*Different Sound hardware*/
//SEIBU_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_CPU_ADD("audiocpu", Z80,14318180/4)
- MDRV_CPU_PROGRAM_MAP(cupsocbl_sound_mem)
- //MDRV_PERIODIC_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("audiocpu", Z80,14318180/4)
+ MCFG_CPU_PROGRAM_MAP(cupsocbl_sound_mem)
+ //MCFG_PERIODIC_INT("screen", nmi_line_pulse)
- //MDRV_MACHINE_INIT(seibu_sound)
+ //MCFG_MACHINE_INIT(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(heatbrl_csb)
- MDRV_PALETTE_LENGTH(128*16)
+ MCFG_GFXDECODE(heatbrl_csb)
+ MCFG_PALETTE_LENGTH(128*16)
- MDRV_VIDEO_START(cupsoc)
- MDRV_VIDEO_UPDATE(grainbow)
+ MCFG_VIDEO_START(cupsoc)
+ MCFG_VIDEO_UPDATE(grainbow)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index 10d77a3ff2e..ecd63ef03a6 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -734,37 +734,37 @@ static const eeprom_interface eeprom_intf =
static MACHINE_CONFIG_START( leland, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("master", Z80, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(master_map_program)
- MDRV_CPU_IO_MAP(master_map_io)
- MDRV_CPU_VBLANK_INT("screen", leland_master_interrupt)
+ MCFG_CPU_ADD("master", Z80, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(master_map_program)
+ MCFG_CPU_IO_MAP(master_map_io)
+ MCFG_CPU_VBLANK_INT("screen", leland_master_interrupt)
- MDRV_CPU_ADD("slave", Z80, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(slave_small_map_program)
- MDRV_CPU_IO_MAP(slave_map_io)
+ MCFG_CPU_ADD("slave", Z80, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(slave_small_map_program)
+ MCFG_CPU_IO_MAP(slave_map_io)
- MDRV_MACHINE_START(leland)
- MDRV_MACHINE_RESET(leland)
+ MCFG_MACHINE_START(leland)
+ MCFG_MACHINE_RESET(leland)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_NVRAM_ADD_0FILL("battery")
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_ADD_0FILL("battery")
/* video hardware */
- MDRV_FRAGMENT_ADD(leland_video)
+ MCFG_FRAGMENT_ADD(leland_video)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910.1", AY8910, 10000000/6)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay8910.1", AY8910, 10000000/6)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay8910.2", AY8910, 10000000/6)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay8910.2", AY8910, 10000000/6)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("custom", LELAND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("custom", LELAND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -772,13 +772,13 @@ static MACHINE_CONFIG_DERIVED( redline, leland )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", I80186, MCU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(leland_80186_map_program)
- MDRV_CPU_IO_MAP(redline_80186_map_io)
+ MCFG_CPU_ADD("audiocpu", I80186, MCU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(leland_80186_map_program)
+ MCFG_CPU_IO_MAP(redline_80186_map_io)
/* sound hardware */
- MDRV_SOUND_REPLACE("custom", REDLINE_80186, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("custom", REDLINE_80186, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -786,12 +786,12 @@ static MACHINE_CONFIG_DERIVED( quarterb, redline )
/* basic machine hardware */
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_IO_MAP(leland_80186_map_io)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_IO_MAP(leland_80186_map_io)
/* sound hardware */
- MDRV_SOUND_REPLACE("custom", LELAND_80186, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("custom", LELAND_80186, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -799,8 +799,8 @@ static MACHINE_CONFIG_DERIVED( lelandi, quarterb )
/* basic machine hardware */
- MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(slave_large_map_program)
+ MCFG_CPU_MODIFY("slave")
+ MCFG_CPU_PROGRAM_MAP(slave_large_map_program)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 45cf1f12d17..562e9ac365a 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -265,43 +265,43 @@ static MACHINE_START( lemmings )
static MACHINE_CONFIG_START( lemmings, lemmings_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(lemmings_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(lemmings_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", M6809,32220000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809,32220000/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(lemmings)
+ MCFG_MACHINE_START(lemmings)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(lemmings)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(lemmings)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_EOF(lemmings)
- MDRV_VIDEO_START(lemmings)
- MDRV_VIDEO_UPDATE(lemmings)
+ MCFG_VIDEO_EOF(lemmings)
+ MCFG_VIDEO_START(lemmings)
+ MCFG_VIDEO_UPDATE(lemmings)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 55f99a46a53..9511011a6f2 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -664,56 +664,56 @@ static const k05324x_interface lethalej_k05324x_intf =
static MACHINE_CONFIG_START( lethalen, lethal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(le_main)
- MDRV_CPU_VBLANK_INT("screen", lethalen_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(le_main)
+ MCFG_CPU_VBLANK_INT("screen", lethalen_interrupt)
- MDRV_CPU_ADD("soundcpu", Z80, MAIN_CLOCK/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(le_sound)
+ MCFG_CPU_ADD("soundcpu", Z80, MAIN_CLOCK/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(le_sound)
- MDRV_MACHINE_START(lethalen)
- MDRV_MACHINE_RESET(lethalen)
+ MCFG_MACHINE_START(lethalen)
+ MCFG_MACHINE_RESET(lethalen)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_EEPROM_DATA(lethalen_default_eeprom, 48)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_DATA(lethalen_default_eeprom, 48)
- MDRV_GFXDECODE(lethal)
+ MCFG_GFXDECODE(lethal)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.62) /* 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(216, 504-1, 16, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.62) /* 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(216, 504-1, 16, 240-1)
- MDRV_PALETTE_LENGTH(7168+1)
+ MCFG_PALETTE_LENGTH(7168+1)
- MDRV_VIDEO_START(lethalen)
- MDRV_VIDEO_UPDATE(lethalen)
+ MCFG_VIDEO_START(lethalen)
+ MCFG_VIDEO_UPDATE(lethalen)
- MDRV_K056832_ADD("k056832", lethalen_k056832_intf)
- MDRV_K053244_ADD("k053244", lethalen_k05324x_intf)
- MDRV_K054000_ADD("k054000")
+ MCFG_K056832_ADD("k056832", lethalen_k056832_intf)
+ MCFG_K053244_ADD("k053244", lethalen_k05324x_intf)
+ MCFG_K054000_ADD("k054000")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("k054539", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("k054539", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lethalej, lethalen )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(224, 512-1, 16, 240-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(224, 512-1, 16, 240-1)
- MDRV_DEVICE_REMOVE("k053244")
- MDRV_K053244_ADD("k053244", lethalej_k05324x_intf)
+ MCFG_DEVICE_REMOVE("k053244")
+ MCFG_K053244_ADD("k053244", lethalej_k05324x_intf)
MACHINE_CONFIG_END
ROM_START( lethalen ) // US version UAE
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index 1a30a93606b..0b363a745f2 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -594,44 +594,44 @@ static const tms34010_config tms_config_lethalj =
static MACHINE_CONFIG_START( gameroom, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, MASTER_CLOCK)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(lethalj_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, MASTER_CLOCK)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(lethalj_map)
- MDRV_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 701, 0, 512, 263, 0, 236)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 701, 0, 512, 263, 0, 236)
- MDRV_VIDEO_START(lethalj)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(lethalj)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(32768)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
+ MCFG_OKIM6295_ADD("oki1", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
- MDRV_OKIM6295_ADD("oki2", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
+ MCFG_OKIM6295_ADD("oki2", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
- MDRV_OKIM6295_ADD("oki3", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
+ MCFG_OKIM6295_ADD("oki3", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.26)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lethalj, gameroom )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(tms_config_lethalj)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(tms_config_lethalj)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK_LETHALJ, 689, 0, 512, 259, 0, 236)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK_LETHALJ, 689, 0, 512, 259, 0, 236)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 4a1dd1f499a..41e68a59020 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -343,35 +343,35 @@ static MACHINE_START( lgp )
/* DRIVER */
static MACHINE_CONFIG_START( lgp, driver_device )
/* main cpu */
- MDRV_CPU_ADD("maincpu", Z80, CPU_PCB_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_program_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_callback_lgp)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_PCB_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_program_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_callback_lgp)
/* sound cpu */
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_PCB_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_program_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_PCB_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_program_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_MACHINE_START(lgp)
+ MCFG_MACHINE_START(lgp)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(lgp, 256, 256, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(lgp, 256, 256, BITMAP_FORMAT_INDEXED16)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_LENGTH(256)
- /* MDRV_PALETTE_INIT(lgp) */
+ MCFG_PALETTE_LENGTH(256)
+ /* MCFG_PALETTE_INIT(lgp) */
- MDRV_GFXDECODE(lgp)
+ MCFG_GFXDECODE(lgp)
/* sound 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
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 8d548060a54..2e62db2f9d6 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -829,121 +829,121 @@ static MACHINE_RESET( liberate )
static MACHINE_CONFIG_START( liberate, liberate_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",DECO16, 2000000)
- MDRV_CPU_PROGRAM_MAP(liberate_map)
- MDRV_CPU_IO_MAP(deco16_io_map)
- MDRV_CPU_VBLANK_INT("screen", deco16_interrupt)
+ MCFG_CPU_ADD("maincpu",DECO16, 2000000)
+ MCFG_CPU_PROGRAM_MAP(liberate_map)
+ MCFG_CPU_IO_MAP(deco16_io_map)
+ MCFG_CPU_VBLANK_INT("screen", deco16_interrupt)
- MDRV_CPU_ADD("audiocpu",M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(liberate_sound_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,16*60) /* ??? */
+ MCFG_CPU_ADD("audiocpu",M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(liberate_sound_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,16*60) /* ??? */
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_START(liberate)
- MDRV_MACHINE_RESET(liberate)
+ MCFG_MACHINE_START(liberate)
+ MCFG_MACHINE_RESET(liberate)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 529ms Vblank duration?? */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529) /* 529ms Vblank duration?? */)
+ 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)
- MDRV_GFXDECODE(liberate)
- MDRV_PALETTE_LENGTH(33)
- MDRV_PALETTE_INIT(liberate)
+ MCFG_GFXDECODE(liberate)
+ MCFG_PALETTE_LENGTH(33)
+ MCFG_PALETTE_INIT(liberate)
- MDRV_VIDEO_START(liberate)
- MDRV_VIDEO_UPDATE(liberate)
+ MCFG_VIDEO_START(liberate)
+ MCFG_VIDEO_UPDATE(liberate)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( liberatb, liberate )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", M6502, 2000000)
- MDRV_CPU_PROGRAM_MAP(liberatb_map)
- MDRV_CPU_VBLANK_INT("screen", deco16_interrupt)
+ MCFG_CPU_REPLACE("maincpu", M6502, 2000000)
+ MCFG_CPU_PROGRAM_MAP(liberatb_map)
+ MCFG_CPU_VBLANK_INT("screen", deco16_interrupt)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( boomrang, liberate )
- MDRV_VIDEO_START(boomrang)
- MDRV_VIDEO_UPDATE(boomrang)
+ MCFG_VIDEO_START(boomrang)
+ MCFG_VIDEO_UPDATE(boomrang)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( prosoccr, liberate )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(10000000/8) //xtal is unknown?
- MDRV_CPU_PROGRAM_MAP(prosoccr_map)
- MDRV_CPU_IO_MAP(prosoccr_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(10000000/8) //xtal is unknown?
+ MCFG_CPU_PROGRAM_MAP(prosoccr_map)
+ MCFG_CPU_IO_MAP(prosoccr_io_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_CLOCK(10000000/8) //xtal is 12 Mhz, divider is unknown
- MDRV_CPU_PROGRAM_MAP(prosoccr_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_CLOCK(10000000/8) //xtal is 12 Mhz, divider is unknown
+ MCFG_CPU_PROGRAM_MAP(prosoccr_sound_map)
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(prosoccr)
+ MCFG_GFXDECODE(prosoccr)
- MDRV_VIDEO_START(prosoccr)
- MDRV_VIDEO_UPDATE(prosoccr)
+ MCFG_VIDEO_START(prosoccr)
+ MCFG_VIDEO_UPDATE(prosoccr)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( prosport, liberate_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", DECO16, 2000000)
- MDRV_CPU_PROGRAM_MAP(prosport_map)
- MDRV_CPU_IO_MAP(deco16_io_map)
- MDRV_CPU_VBLANK_INT("screen", deco16_interrupt)
+ MCFG_CPU_ADD("maincpu", DECO16, 2000000)
+ MCFG_CPU_PROGRAM_MAP(prosport_map)
+ MCFG_CPU_IO_MAP(deco16_io_map)
+ MCFG_CPU_VBLANK_INT("screen", deco16_interrupt)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000/2)
- MDRV_CPU_PROGRAM_MAP(liberate_sound_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,16*60) /* ??? */
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000/2)
+ MCFG_CPU_PROGRAM_MAP(liberate_sound_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,16*60) /* ??? */
-// MDRV_QUANTUM_TIME(HZ(12000))
+// MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_START(liberate)
- MDRV_MACHINE_RESET(liberate)
+ MCFG_MACHINE_START(liberate)
+ MCFG_MACHINE_RESET(liberate)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1529) /* 529ms Vblank duration?? */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1529) /* 529ms Vblank duration?? */)
+ 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)
- MDRV_GFXDECODE(prosport)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(prosport)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(prosport)
- MDRV_VIDEO_UPDATE(prosport)
+ MCFG_VIDEO_START(prosport)
+ MCFG_VIDEO_UPDATE(prosport)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index 7af4d49239b..d4f9a8f2103 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -389,38 +389,38 @@ static const pokey_interface pokey_interface_2 =
static MACHINE_CONFIG_START( liberatr, liberatr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */
- MDRV_CPU_PROGRAM_MAP(liberatr_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */
+ MCFG_CPU_PROGRAM_MAP(liberatr_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
- MDRV_ER2055_ADD("earom")
+ MCFG_ER2055_ADD("earom")
/* 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_RGB32)
- MDRV_SCREEN_SIZE(256,256)
- MDRV_SCREEN_VISIBLE_AREA(8, 247, 13, 244)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(256,256)
+ MCFG_SCREEN_VISIBLE_AREA(8, 247, 13, 244)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( liberat2, liberatr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(liberat2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(liberat2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index b144910e89c..afe48dd7fc1 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -641,60 +641,60 @@ GFXDECODE_END
static MACHINE_CONFIG_START( limenko, driver_device )
- MDRV_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(limenko_map)
- MDRV_CPU_IO_MAP(limenko_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
+ MCFG_CPU_PROGRAM_MAP(limenko_map)
+ MCFG_CPU_IO_MAP(limenko_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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(384, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 383, 0, 239)
+ 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(384, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 383, 0, 239)
- MDRV_GFXDECODE(limenko)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(limenko)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(limenko)
- MDRV_VIDEO_UPDATE(limenko)
+ MCFG_VIDEO_START(limenko)
+ MCFG_VIDEO_UPDATE(limenko)
/* sound hardware */
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spotty, driver_device )
- MDRV_CPU_ADD("maincpu", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
- MDRV_CPU_PROGRAM_MAP(spotty_map)
- MDRV_CPU_IO_MAP(spotty_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
+ MCFG_CPU_PROGRAM_MAP(spotty_map)
+ MCFG_CPU_IO_MAP(spotty_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", AT89C4051, 4000000) /* 4 MHz */
- MDRV_CPU_IO_MAP(spotty_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", AT89C4051, 4000000) /* 4 MHz */
+ MCFG_CPU_IO_MAP(spotty_sound_io_map)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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(384, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 383, 0, 239)
+ 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(384, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 383, 0, 239)
- MDRV_GFXDECODE(limenko)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(limenko)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(limenko)
- MDRV_VIDEO_UPDATE(limenko)
+ MCFG_VIDEO_START(limenko)
+ MCFG_VIDEO_UPDATE(limenko)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 4000000 / 4 , OKIM6295_PIN7_HIGH) //?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 4000000 / 4 , OKIM6295_PIN7_HIGH) //?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index d0ccfec96de..829e659fbbf 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -495,24 +495,24 @@ static INTERRUPT_GEN( littlerb )
}
static MACHINE_CONFIG_START( littlerb, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(littlerb_main)
- MDRV_CPU_VBLANK_INT("screen", littlerb)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(littlerb_main)
+ MCFG_CPU_VBLANK_INT("screen", littlerb)
- 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*8, 320-1, 0*8, 256-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*8, 320-1, 0*8, 256-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_DEVICE_ADD("littlerbvdp", LITTLERBVDP, 0)
+ MCFG_DEVICE_ADD("littlerbvdp", LITTLERBVDP, 0)
-// MDRV_PALETTE_INIT(littlerb)
- MDRV_VIDEO_UPDATE(littlerb)
+// MCFG_PALETTE_INIT(littlerb)
+ MCFG_VIDEO_UPDATE(littlerb)
MACHINE_CONFIG_END
ROM_START( littlerb )
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index c77d7edde33..7feaaccf626 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -557,97 +557,97 @@ static MACHINE_RESET( lkage )
static MACHINE_CONFIG_START( lkage, lkage_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(lkage_map)
- MDRV_CPU_IO_MAP(lkage_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(lkage_map)
+ MCFG_CPU_IO_MAP(lkage_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(lkage_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(lkage_sound_map)
/* IRQs are triggered by the YM2203 */
- MDRV_CPU_ADD("mcu", M68705,MCU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(lkage_m68705_map)
+ MCFG_CPU_ADD("mcu", M68705,MCU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(lkage_m68705_map)
- MDRV_MACHINE_START(lkage)
- MDRV_MACHINE_RESET(lkage)
+ MCFG_MACHINE_START(lkage)
+ MCFG_MACHINE_RESET(lkage)
/* 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(2*8, 32*8-1, 2*8, 30*8-1)
+ 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(2*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(lkage)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(lkage)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(lkage)
- MDRV_VIDEO_UPDATE(lkage)
+ MCFG_VIDEO_START(lkage)
+ MCFG_VIDEO_UPDATE(lkage)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, AUDIO_CLOCK )
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.40)
-
- MDRV_SOUND_ADD("ym2", YM2203, AUDIO_CLOCK )
- 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.40)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, AUDIO_CLOCK )
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
+
+ MCFG_SOUND_ADD("ym2", YM2203, AUDIO_CLOCK )
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( lkageb, lkage_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(lkage_map)
- MDRV_CPU_IO_MAP(lkage_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(lkage_map)
+ MCFG_CPU_IO_MAP(lkage_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(lkage_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(lkage_sound_map)
/* IRQs are triggered by the YM2203 */
- MDRV_MACHINE_START(lkage)
- MDRV_MACHINE_RESET(lkage)
+ MCFG_MACHINE_START(lkage)
+ MCFG_MACHINE_RESET(lkage)
/* 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(2*8, 32*8-1, 2*8, 30*8-1)
+ 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(2*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(lkage)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(lkage)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(lkage)
- MDRV_VIDEO_UPDATE(lkage)
+ MCFG_VIDEO_START(lkage)
+ MCFG_VIDEO_UPDATE(lkage)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, AUDIO_CLOCK)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.40)
-
- MDRV_SOUND_ADD("ym2", YM2203, AUDIO_CLOCK)
- 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.40)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, AUDIO_CLOCK)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
+
+ MCFG_SOUND_ADD("ym2", YM2203, AUDIO_CLOCK)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
MACHINE_CONFIG_END
ROM_START( lkage )
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 43b4d9347b3..b13c01118a3 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -519,64 +519,64 @@ static MACHINE_RESET( lockon )
static MACHINE_CONFIG_START( lockon, lockon_state )
- MDRV_CPU_ADD("maincpu", V30, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(main_v30)
-
- MDRV_CPU_ADD("ground", V30, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(ground_v30)
-
- MDRV_CPU_ADD("object", V30, XTAL_16MHz / 2)
- MDRV_CPU_PROGRAM_MAP(object_v30)
-
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz / 4)
- MDRV_CPU_PROGRAM_MAP(sound_prg)
- MDRV_CPU_IO_MAP(sound_io)
-
- MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_ASTABLE_NSEC(10000, 4700, 10000e-12) * 4096))
- MDRV_QUANTUM_TIME(HZ(600))
-
- MDRV_MACHINE_START(lockon)
- MDRV_MACHINE_RESET(lockon)
-
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
-
- MDRV_GFXDECODE(lockon)
- MDRV_PALETTE_INIT(lockon)
- MDRV_PALETTE_LENGTH(1024 + 2048)
-
- MDRV_VIDEO_START(lockon)
- MDRV_VIDEO_UPDATE(lockon)
- MDRV_VIDEO_EOF(lockon)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "f2203.1l", 1.0)
- MDRV_SOUND_ROUTE(1, "f2203.1r", 1.0)
- MDRV_SOUND_ROUTE(2, "f2203.2l", 1.0)
- MDRV_SOUND_ROUTE(2, "f2203.2r", 1.0)
- MDRV_SOUND_ROUTE(3, "f2203.3l", 1.0)
- MDRV_SOUND_ROUTE(3, "f2203.3r", 1.0)
-
- MDRV_SOUND_ADD("f2203.1l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("f2203.1r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("f2203.2l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("f2203.2r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("f2203.3l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("f2203.3r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(main_v30)
+
+ MCFG_CPU_ADD("ground", V30, XTAL_16MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(ground_v30)
+
+ MCFG_CPU_ADD("object", V30, XTAL_16MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(object_v30)
+
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_PROGRAM_MAP(sound_prg)
+ MCFG_CPU_IO_MAP(sound_io)
+
+ MCFG_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_ASTABLE_NSEC(10000, 4700, 10000e-12) * 4096))
+ MCFG_QUANTUM_TIME(HZ(600))
+
+ MCFG_MACHINE_START(lockon)
+ MCFG_MACHINE_RESET(lockon)
+
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+
+ MCFG_GFXDECODE(lockon)
+ MCFG_PALETTE_INIT(lockon)
+ MCFG_PALETTE_LENGTH(1024 + 2048)
+
+ MCFG_VIDEO_START(lockon)
+ MCFG_VIDEO_UPDATE(lockon)
+ MCFG_VIDEO_EOF(lockon)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_16MHz / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "f2203.1l", 1.0)
+ MCFG_SOUND_ROUTE(1, "f2203.1r", 1.0)
+ MCFG_SOUND_ROUTE(2, "f2203.2l", 1.0)
+ MCFG_SOUND_ROUTE(2, "f2203.2r", 1.0)
+ MCFG_SOUND_ROUTE(3, "f2203.3l", 1.0)
+ MCFG_SOUND_ROUTE(3, "f2203.3r", 1.0)
+
+ MCFG_SOUND_ADD("f2203.1l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("f2203.1r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("f2203.2l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("f2203.2r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("f2203.3l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("f2203.3r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 3214deb65e2..f37fb70d59d 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -609,48 +609,48 @@ static COP400_INTERFACE( looping_cop_intf )
static MACHINE_CONFIG_START( looping, looping_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS9995, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(looping_map)
- MDRV_CPU_IO_MAP(looping_io_map)
- MDRV_CPU_VBLANK_INT("screen", looping_interrupt)
+ MCFG_CPU_ADD("maincpu", TMS9995, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(looping_map)
+ MCFG_CPU_IO_MAP(looping_io_map)
+ MCFG_CPU_VBLANK_INT("screen", looping_interrupt)
- MDRV_CPU_ADD("audiocpu", TMS9980, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(looping_sound_map)
- MDRV_CPU_IO_MAP(looping_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", TMS9980, SOUND_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(looping_sound_map)
+ MCFG_CPU_IO_MAP(looping_sound_io_map)
- MDRV_CPU_ADD("mcu", COP420, COP_CLOCK)
- MDRV_CPU_PROGRAM_MAP(looping_cop_map)
- MDRV_CPU_DATA_MAP(looping_cop_data_map)
- MDRV_CPU_IO_MAP(looping_cop_io_map)
- MDRV_CPU_CONFIG(looping_cop_intf)
+ MCFG_CPU_ADD("mcu", COP420, COP_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(looping_cop_map)
+ MCFG_CPU_DATA_MAP(looping_cop_data_map)
+ MCFG_CPU_IO_MAP(looping_cop_io_map)
+ MCFG_CPU_CONFIG(looping_cop_intf)
- MDRV_MACHINE_START(looping)
+ MCFG_MACHINE_START(looping)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_GFXDECODE(looping)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(looping)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(looping)
- MDRV_VIDEO_START(looping)
- MDRV_VIDEO_UPDATE(looping)
+ MCFG_PALETTE_INIT(looping)
+ MCFG_VIDEO_START(looping)
+ MCFG_VIDEO_UPDATE(looping)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("tms", TMS5220, TMS_CLOCK)
- MDRV_SOUND_CONFIG(tms5220_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("tms", TMS5220, TMS_CLOCK)
+ MCFG_SOUND_CONFIG(tms5220_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- 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/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 7d79ef83ff7..b60949de8fb 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -651,41 +651,41 @@ static const ym3812_interface lordgun_ym3812_interface =
};
static MACHINE_CONFIG_START( lordgun, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(lordgun_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(lordgun_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_20MHz / 4)
- MDRV_CPU_PROGRAM_MAP(lordgun_soundmem_map)
- MDRV_CPU_IO_MAP(lordgun_soundio_map)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_20MHz / 4)
+ MCFG_CPU_PROGRAM_MAP(lordgun_soundmem_map)
+ MCFG_CPU_IO_MAP(lordgun_soundio_map)
- MDRV_PPI8255_ADD( "ppi8255_0", lordgun_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", lordgun_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", lordgun_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", lordgun_ppi8255_intf[1] )
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- 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(0x200, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0,0x1c0-1, 0,0xe0-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(0x200, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0,0x1c0-1, 0,0xe0-1)
- MDRV_GFXDECODE(lordgun)
- MDRV_PALETTE_LENGTH(0x800 * 8) // 0x800 real colors, repeated per priority level
+ MCFG_GFXDECODE(lordgun)
+ MCFG_PALETTE_LENGTH(0x800 * 8) // 0x800 real colors, repeated per priority level
- MDRV_VIDEO_START(lordgun)
- MDRV_VIDEO_UPDATE(lordgun)
+ MCFG_VIDEO_START(lordgun)
+ MCFG_VIDEO_UPDATE(lordgun)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
- MDRV_SOUND_CONFIG(lordgun_ym3812_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_CONFIG(lordgun_ym3812_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right!
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right!
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -695,44 +695,44 @@ static const ymf278b_interface ymf278b_config =
};
static MACHINE_CONFIG_START( aliencha, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
- MDRV_CPU_PROGRAM_MAP(aliencha_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(aliencha_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_20MHz / 4)
- MDRV_CPU_PROGRAM_MAP(lordgun_soundmem_map)
- MDRV_CPU_IO_MAP(aliencha_soundio_map)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_20MHz / 4)
+ MCFG_CPU_PROGRAM_MAP(lordgun_soundmem_map)
+ MCFG_CPU_IO_MAP(aliencha_soundio_map)
- MDRV_PPI8255_ADD( "ppi8255_0", aliencha_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", aliencha_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", aliencha_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", aliencha_ppi8255_intf[1] )
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- 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(0x200, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0,0x1c0-1, 0,0xe0-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(0x200, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0,0x1c0-1, 0,0xe0-1)
- MDRV_GFXDECODE(lordgun)
- MDRV_PALETTE_LENGTH(0x800 * 8) // 0x800 real colors, repeated per priority level
+ MCFG_GFXDECODE(lordgun)
+ MCFG_PALETTE_LENGTH(0x800 * 8) // 0x800 real colors, repeated per priority level
- MDRV_VIDEO_START(lordgun)
- MDRV_VIDEO_UPDATE(lordgun)
+ MCFG_VIDEO_START(lordgun)
+ MCFG_VIDEO_UPDATE(lordgun)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymf", YMF278B, 26000000) // ? 26MHz matches video (decrease for faster music tempo)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("ymf", YMF278B, 26000000) // ? 26MHz matches video (decrease for faster music tempo)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki2", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index b15b804add2..fe60bfa4553 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -619,106 +619,106 @@ static MACHINE_RESET( lsasquad )
static MACHINE_CONFIG_START( lsasquad, lsasquad_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4)
- MDRV_CPU_PROGRAM_MAP(lsasquad_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4)
+ MCFG_CPU_PROGRAM_MAP(lsasquad_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(lsasquad_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(lsasquad_sound_map)
/* IRQs are triggered by the YM2203 */
- MDRV_CPU_ADD("mcu", M68705, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(lsasquad_m68705_map)
+ MCFG_CPU_ADD("mcu", M68705, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(lsasquad_m68705_map)
- MDRV_QUANTUM_TIME(HZ(30000)) /* 500 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(30000)) /* 500 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
/* main<->sound synchronization depends on this */
- MDRV_MACHINE_START(lsasquad)
- MDRV_MACHINE_RESET(lsasquad)
+ MCFG_MACHINE_START(lsasquad)
+ MCFG_MACHINE_RESET(lsasquad)
/* 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, 32*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, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(lsasquad)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(lsasquad)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_UPDATE(lsasquad)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_UPDATE(lsasquad)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.12)
- MDRV_SOUND_ROUTE(1, "mono", 0.12)
- MDRV_SOUND_ROUTE(2, "mono", 0.12)
- MDRV_SOUND_ROUTE(3, "mono", 0.63)
+ MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.12)
+ MCFG_SOUND_ROUTE(1, "mono", 0.12)
+ MCFG_SOUND_ROUTE(2, "mono", 0.12)
+ MCFG_SOUND_ROUTE(3, "mono", 0.63)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( storming, lsasquad )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(storming_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(storming_map)
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( daikaiju, lsasquad_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4)
- MDRV_CPU_PROGRAM_MAP(daikaiju_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4)
+ MCFG_CPU_PROGRAM_MAP(daikaiju_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(daikaiju_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(daikaiju_sound_map)
/* IRQs are triggered by the YM2203 */
- MDRV_CPU_ADD("mcu", M68705, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(lsasquad_m68705_map)
+ MCFG_CPU_ADD("mcu", M68705, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(lsasquad_m68705_map)
- MDRV_QUANTUM_TIME(HZ(30000)) /* 500 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(30000)) /* 500 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
/* main<->sound synchronization depends on this */
- MDRV_MACHINE_START(lsasquad)
- MDRV_MACHINE_RESET(lsasquad)
+ MCFG_MACHINE_START(lsasquad)
+ MCFG_MACHINE_RESET(lsasquad)
/* 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, 32*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, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(lsasquad)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(lsasquad)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_UPDATE(daikaiju)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_UPDATE(daikaiju)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.12)
- MDRV_SOUND_ROUTE(1, "mono", 0.12)
- MDRV_SOUND_ROUTE(2, "mono", 0.12)
- MDRV_SOUND_ROUTE(3, "mono", 0.63)
+ MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.12)
+ MCFG_SOUND_ROUTE(1, "mono", 0.12)
+ MCFG_SOUND_ROUTE(2, "mono", 0.12)
+ MCFG_SOUND_ROUTE(3, "mono", 0.63)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index b030adbda9b..e053f1a1e79 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -628,29 +628,29 @@ static VIDEO_UPDATE(ltcasino)
static MACHINE_CONFIG_START( ltcasino, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(ltcasino_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(ltcasino_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(6*8, 58*8-1, 0, 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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(6*8, 58*8-1, 0, 32*8-1)
- MDRV_GFXDECODE(ltcasino)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(ltcasino)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(ltcasino)
- MDRV_VIDEO_UPDATE(ltcasino)
+ MCFG_VIDEO_START(ltcasino)
+ MCFG_VIDEO_UPDATE(ltcasino)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c
index 5bec2954f5d..245e7055d76 100644
--- a/src/mame/drivers/luckgrln.c
+++ b/src/mame/drivers/luckgrln.c
@@ -816,27 +816,27 @@ static INTERRUPT_GEN( luckgrln_irq )
}
static MACHINE_CONFIG_START( luckgrln, driver_device )
- MDRV_CPU_ADD("maincpu", Z180,8000000)
- MDRV_CPU_PROGRAM_MAP(mainmap)
- MDRV_CPU_IO_MAP(portmap)
- MDRV_CPU_VBLANK_INT("screen", luckgrln_irq)
+ MCFG_CPU_ADD("maincpu", Z180,8000000)
+ MCFG_CPU_PROGRAM_MAP(mainmap)
+ MCFG_CPU_IO_MAP(portmap)
+ MCFG_CPU_VBLANK_INT("screen", luckgrln_irq)
- MDRV_MC6845_ADD("crtc", H46505, 6000000/4, mc6845_intf) /* unknown clock, hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, 6000000/4, mc6845_intf) /* unknown clock, hand tuned to get ~60 fps */
- 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-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-1)
- MDRV_GFXDECODE(luckgrln)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(luckgrln)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_VIDEO_START(luckgrln)
- MDRV_VIDEO_UPDATE(luckgrln)
+ MCFG_VIDEO_START(luckgrln)
+ MCFG_VIDEO_UPDATE(luckgrln)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index ac79fcf4cc5..9dd993418dd 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -1233,56 +1233,56 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( lucky74, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, C_06B49P_CLKOUT_03) /* 3 MHz. */
- MDRV_CPU_PROGRAM_MAP(lucky74_map)
- MDRV_CPU_IO_MAP(lucky74_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_interrupt) /* 60 Hz. measured */
+ MCFG_CPU_ADD("maincpu", Z80, C_06B49P_CLKOUT_03) /* 3 MHz. */
+ MCFG_CPU_PROGRAM_MAP(lucky74_map)
+ MCFG_CPU_IO_MAP(lucky74_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_interrupt) /* 60 Hz. measured */
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_SOUND_START(lucky74)
+ MCFG_SOUND_START(lucky74)
/* 2x 82c255 (4x 8255) */
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
- MDRV_PPI8255_ADD( "ppi8255_3", ppi8255_intf[3] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_3", ppi8255_intf[3] )
/* 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, 64*8-1, 1*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 30*8-1)
- MDRV_GFXDECODE(lucky74)
+ MCFG_GFXDECODE(lucky74)
- MDRV_PALETTE_INIT(lucky74)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(lucky74)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(lucky74)
- MDRV_VIDEO_UPDATE(lucky74)
+ MCFG_VIDEO_START(lucky74)
+ MCFG_VIDEO_UPDATE(lucky74)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("sn1", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("sn2", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("sn2", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("sn3", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("sn3", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("aysnd", AY8910, C_06B49P_CLKOUT_04) /* 1.5 MHz. */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.00) /* not routed to audio hardware */
+ MCFG_SOUND_ADD("aysnd", AY8910, C_06B49P_CLKOUT_04) /* 1.5 MHz. */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.00) /* not routed to audio hardware */
- MDRV_SOUND_ADD("msm", MSM5205, C_06B49P_CLKOUT_06) /* 375 kHz. */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("msm", MSM5205, C_06B49P_CLKOUT_06) /* 375 kHz. */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index dfb84c4be86..4838f34545c 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -464,56 +464,56 @@ static const ay8910_interface lcay8910_interface =
static MACHINE_CONFIG_START( lvcards, driver_device )
// basic machine hardware
- MDRV_CPU_ADD("maincpu",Z80, 18432000/6) // 3.072 MHz ?
+ MCFG_CPU_ADD("maincpu",Z80, 18432000/6) // 3.072 MHz ?
- MDRV_CPU_PROGRAM_MAP(lvcards_map)
- MDRV_CPU_IO_MAP(lvcards_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_PROGRAM_MAP(lvcards_map)
+ MCFG_CPU_IO_MAP(lvcards_io_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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*0, 32*8-1, 2*8, 30*8-1)
+ 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(8*0, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(lvcards)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(lvcards)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(lvcards)
- MDRV_VIDEO_START(lvcards)
- MDRV_VIDEO_UPDATE(lvcards)
+ MCFG_PALETTE_INIT(lvcards)
+ MCFG_VIDEO_START(lvcards)
+ MCFG_VIDEO_UPDATE(lvcards)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 18432000/12)
- MDRV_SOUND_CONFIG(lcay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, 18432000/12)
+ MCFG_SOUND_CONFIG(lcay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lvpoker, lvcards )
// basic machine hardware
- MDRV_NVRAM_ADD_1FILL("nvram")
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lvpoker_map)
- MDRV_MACHINE_START(lvpoker)
- MDRV_MACHINE_RESET(lvpoker)
+ MCFG_NVRAM_ADD_1FILL("nvram")
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(lvpoker_map)
+ MCFG_MACHINE_START(lvpoker)
+ MCFG_MACHINE_RESET(lvpoker)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ponttehk, lvcards )
// basic machine hardware
- MDRV_NVRAM_ADD_1FILL("nvram")
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ponttehk_map)
- MDRV_MACHINE_RESET(lvpoker)
+ MCFG_NVRAM_ADD_1FILL("nvram")
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ponttehk_map)
+ MCFG_MACHINE_RESET(lvpoker)
// video hardware
- MDRV_PALETTE_INIT(ponttehk)
+ MCFG_PALETTE_INIT(ponttehk)
MACHINE_CONFIG_END
ROM_START( lvpoker )
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 0ef02f04b10..7105780c6f6 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -777,88 +777,88 @@ static MACHINE_RESET( lwings )
static MACHINE_CONFIG_START( lwings, lwings_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on PCB */
- MDRV_CPU_PROGRAM_MAP(lwings_map)
- MDRV_CPU_VBLANK_INT("screen", lwings_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on PCB */
+ MCFG_CPU_PROGRAM_MAP(lwings_map)
+ MCFG_CPU_VBLANK_INT("screen", lwings_interrupt)
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_12MHz/4) /* verified on PCB */
- MDRV_CPU_PROGRAM_MAP(lwings_sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ??? */
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_12MHz/4) /* verified on PCB */
+ MCFG_CPU_PROGRAM_MAP(lwings_sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ??? */
- MDRV_MACHINE_START(lwings)
- MDRV_MACHINE_RESET(lwings)
+ MCFG_MACHINE_START(lwings)
+ MCFG_MACHINE_RESET(lwings)
/* 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(0))
- 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)
+ 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, 1*8, 31*8-1)
- MDRV_GFXDECODE(lwings)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(lwings)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(lwings)
- MDRV_VIDEO_EOF(lwings)
- MDRV_VIDEO_UPDATE(lwings)
+ MCFG_VIDEO_START(lwings)
+ MCFG_VIDEO_EOF(lwings)
+ MCFG_VIDEO_UPDATE(lwings)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("2203a", YM2203, XTAL_12MHz/8) /* verified on PCB */
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.10)
-
- MDRV_SOUND_ADD("2203b", YM2203, XTAL_12MHz/8) /* verified on PCB */
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("2203a", YM2203, XTAL_12MHz/8) /* verified on PCB */
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.10)
+
+ MCFG_SOUND_ADD("2203b", YM2203, XTAL_12MHz/8) /* verified on PCB */
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( trojan, lwings )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(XTAL_12MHz/4) /* verified on PCB */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(XTAL_12MHz/4) /* verified on PCB */
- MDRV_CPU_PROGRAM_MAP(trojan_map)
+ MCFG_CPU_PROGRAM_MAP(trojan_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CLOCK(XTAL_12MHz/4) /* verified on PCB */
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CLOCK(XTAL_12MHz/4) /* verified on PCB */
- MDRV_CPU_ADD("adpcm", Z80, XTAL_12MHz/4) /* verified on PCB */
- MDRV_CPU_PROGRAM_MAP(trojan_adpcm_map)
- MDRV_CPU_IO_MAP(trojan_adpcm_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 4000)
+ MCFG_CPU_ADD("adpcm", Z80, XTAL_12MHz/4) /* verified on PCB */
+ MCFG_CPU_PROGRAM_MAP(trojan_adpcm_map)
+ MCFG_CPU_IO_MAP(trojan_adpcm_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4000)
/* video hardware */
- MDRV_GFXDECODE(trojan)
+ MCFG_GFXDECODE(trojan)
- MDRV_VIDEO_START(trojan)
- MDRV_VIDEO_UPDATE(trojan)
+ MCFG_VIDEO_START(trojan)
+ MCFG_VIDEO_UPDATE(trojan)
/* sound hardware */
- MDRV_SOUND_ADD("5205", MSM5205, XTAL_455kHz) /* verified on PCB */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("5205", MSM5205, XTAL_455kHz) /* verified on PCB */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( avengers, trojan )
- MDRV_CPU_MODIFY("maincpu") //AT: (avengers37b16gre)
- MDRV_CPU_PROGRAM_MAP(avengers_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) // RST 38h triggered by software
+ MCFG_CPU_MODIFY("maincpu") //AT: (avengers37b16gre)
+ MCFG_CPU_PROGRAM_MAP(avengers_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) // RST 38h triggered by software
- MDRV_CPU_MODIFY("adpcm")
- MDRV_CPU_IO_MAP(avengers_adpcm_io_map)
+ MCFG_CPU_MODIFY("adpcm")
+ MCFG_CPU_IO_MAP(avengers_adpcm_io_map)
/* video hardware */
- MDRV_VIDEO_START(avengers)
+ MCFG_VIDEO_START(avengers)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index 837d29f3c9d..7a199ff46d8 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -836,46 +836,46 @@ static const samples_interface m10_samples_interface =
static MACHINE_CONFIG_START( m10, m10_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,IREMM10_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(m10_main)
+ MCFG_CPU_ADD("maincpu", M6502,IREMM10_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(m10_main)
- MDRV_MACHINE_START(m10)
- MDRV_MACHINE_RESET(m10)
+ MCFG_MACHINE_START(m10)
+ MCFG_MACHINE_RESET(m10)
- //MDRV_CPU_VBLANK_INT("screen", m10_interrupt)
+ //MCFG_CPU_VBLANK_INT("screen", m10_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(IREMM10_PIXEL_CLOCK, IREMM10_HTOTAL, IREMM10_HBEND, IREMM10_HBSTART, IREMM10_VTOTAL, IREMM10_VBEND, IREMM10_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(IREMM10_PIXEL_CLOCK, IREMM10_HTOTAL, IREMM10_HBEND, IREMM10_HBSTART, IREMM10_VTOTAL, IREMM10_VBEND, IREMM10_VBSTART)
- MDRV_GFXDECODE(m10)
- MDRV_PALETTE_LENGTH(2*8)
+ MCFG_GFXDECODE(m10)
+ MCFG_PALETTE_LENGTH(2*8)
- MDRV_PALETTE_INIT(m10)
- MDRV_VIDEO_START(m10)
- MDRV_VIDEO_UPDATE(m10)
+ MCFG_PALETTE_INIT(m10)
+ MCFG_VIDEO_START(m10)
+ MCFG_VIDEO_UPDATE(m10)
/* 74LS123 */
- MDRV_TTL74123_ADD("ic8j1", ic8j1_intf)
- MDRV_TTL74123_ADD("ic8j2", ic8j2_intf)
+ MCFG_TTL74123_ADD("ic8j1", ic8j1_intf)
+ MCFG_TTL74123_ADD("ic8j2", ic8j2_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(m10_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(m10_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( m11, m10 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(m11_main)
- //MDRV_CPU_VBLANK_INT("screen", m11_interrupt)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(m11_main)
+ //MCFG_CPU_VBLANK_INT("screen", m11_interrupt)
/* sound hardware */
MACHINE_CONFIG_END
@@ -883,38 +883,38 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( m15, m10_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,IREMM15_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(m15_main)
+ MCFG_CPU_ADD("maincpu", M6502,IREMM15_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(m15_main)
- MDRV_MACHINE_START(m10)
- MDRV_MACHINE_RESET(m10)
+ MCFG_MACHINE_START(m10)
+ MCFG_MACHINE_RESET(m10)
- MDRV_CPU_VBLANK_INT("screen", m15_interrupt)
+ MCFG_CPU_VBLANK_INT("screen", m15_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(IREMM15_PIXEL_CLOCK, IREMM15_HTOTAL, IREMM15_HBEND, IREMM15_HBSTART, IREMM15_VTOTAL, IREMM15_VBEND, IREMM15_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(IREMM15_PIXEL_CLOCK, IREMM15_HTOTAL, IREMM15_HBEND, IREMM15_HBSTART, IREMM15_VTOTAL, IREMM15_VBEND, IREMM15_VBSTART)
- MDRV_PALETTE_LENGTH(2*8)
+ MCFG_PALETTE_LENGTH(2*8)
- MDRV_PALETTE_INIT(m10)
- MDRV_VIDEO_START( m15 )
- MDRV_VIDEO_UPDATE(m15)
+ MCFG_PALETTE_INIT(m10)
+ MCFG_VIDEO_START( m15 )
+ MCFG_VIDEO_UPDATE(m15)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(m10_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(m10_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( headoni, m15 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(11730000/16)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(11730000/16)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 30c1ac9e1ac..f9ca948fa24 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -820,67 +820,67 @@ static const nec_config firebarr_config ={ rtypeleo_decryption_table, };
static MACHINE_CONFIG_START( firebarr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V33, 28000000/2) /* NEC V33, 28MHz clock */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_ADD("maincpu", V33, 28000000/2) /* NEC V33, 28MHz clock */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
- MDRV_CPU_ADD("soundcpu", V35, 14318000/2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_CONFIG(firebarr_config)
+ MCFG_CPU_ADD("soundcpu", V35, 14318000/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_CONFIG(firebarr_config)
- MDRV_MACHINE_START(m107)
- MDRV_MACHINE_RESET(m107)
+ MCFG_MACHINE_START(m107)
+ MCFG_MACHINE_RESET(m107)
/* 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(80, 511-112, 8, 247) /* 320 x 240 */
+ 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(80, 511-112, 8, 247) /* 320 x 240 */
- MDRV_GFXDECODE(firebarr)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(firebarr)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(m107)
- MDRV_VIDEO_UPDATE(m107)
+ MCFG_VIDEO_START(m107)
+ MCFG_VIDEO_UPDATE(m107)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 14318180/4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MDRV_SOUND_ADD("irem", IREMGA20, 14318180/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("irem", IREMGA20, 14318180/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static const nec_config dsoccr94_config ={ dsoccr94_decryption_table, };
static MACHINE_CONFIG_DERIVED( dsoccr94, firebarr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(20000000/2) /* NEC V33, Could be 28MHz clock? */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(20000000/2) /* NEC V33, Could be 28MHz clock? */
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(dsoccr94_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(dsoccr94_config)
/* video hardware */
- MDRV_GFXDECODE(m107)
+ MCFG_GFXDECODE(m107)
MACHINE_CONFIG_END
static const nec_config wpksoc_config ={ leagueman_decryption_table, };
static MACHINE_CONFIG_DERIVED( wpksoc, firebarr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wpksoc_map)
- MDRV_CPU_IO_MAP(wpksoc_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wpksoc_map)
+ MCFG_CPU_IO_MAP(wpksoc_io_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(wpksoc_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(wpksoc_config)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c
index c856e467219..1ac844a7cef 100644
--- a/src/mame/drivers/m14.c
+++ b/src/mame/drivers/m14.c
@@ -331,34 +331,34 @@ static MACHINE_RESET( m14 )
static MACHINE_CONFIG_START( m14, m14_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",I8085A,6000000/2) //guess: 6 Mhz internally divided by 2
- MDRV_CPU_PROGRAM_MAP(m14_map)
- MDRV_CPU_IO_MAP(m14_io_map)
- MDRV_CPU_VBLANK_INT("screen",m14_irq)
+ MCFG_CPU_ADD("maincpu",I8085A,6000000/2) //guess: 6 Mhz internally divided by 2
+ MCFG_CPU_PROGRAM_MAP(m14_map)
+ MCFG_CPU_IO_MAP(m14_io_map)
+ MCFG_CPU_VBLANK_INT("screen",m14_irq)
- MDRV_MACHINE_START(m14)
- MDRV_MACHINE_RESET(m14)
+ MCFG_MACHINE_START(m14)
+ MCFG_MACHINE_RESET(m14)
/* 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(0*8, 32*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(m14)
- MDRV_PALETTE_LENGTH(0x20)
- MDRV_PALETTE_INIT(m14)
-
- MDRV_VIDEO_START(m14)
- MDRV_VIDEO_UPDATE(m14)
+ 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(0*8, 32*8-1, 0*8, 28*8-1)
+ MCFG_GFXDECODE(m14)
+ MCFG_PALETTE_LENGTH(0x20)
+ MCFG_PALETTE_INIT(m14)
+
+ MCFG_VIDEO_START(m14)
+ MCFG_VIDEO_UPDATE(m14)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
+// MCFG_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("discrete", DISCRETE, 0)
-// MDRV_SOUND_CONFIG_DISCRETE(m14)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+// MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+// MCFG_SOUND_CONFIG_DISCRETE(m14)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c
index 137ebe4eb25..086f045ffb0 100644
--- a/src/mame/drivers/m52.c
+++ b/src/mame/drivers/m52.c
@@ -394,35 +394,35 @@ static MACHINE_RESET( m52 )
static MACHINE_CONFIG_START( m52, m52_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(m52)
+ MCFG_MACHINE_RESET(m52)
/* video hardware */
- MDRV_GFXDECODE(m52)
- MDRV_PALETTE_LENGTH(128*4+16*4+3*4)
+ MCFG_GFXDECODE(m52)
+ MCFG_PALETTE_LENGTH(128*4+16*4+3*4)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 136, 376, 282, 22, 274)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 136, 376, 282, 22, 274)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_INIT(m52)
- MDRV_VIDEO_START(m52)
- MDRV_VIDEO_UPDATE(m52)
+ MCFG_PALETTE_INIT(m52)
+ MCFG_VIDEO_START(m52)
+ MCFG_VIDEO_UPDATE(m52)
/* sound hardware */
- MDRV_FRAGMENT_ADD(m52_sound_c_audio)
+ MCFG_FRAGMENT_ADD(m52_sound_c_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( alpha1v, m52 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(alpha1v_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(alpha1v_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 04787871e93..fe5d65695c2 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -226,29 +226,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( m57, m57_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790) /* accurate frequency, measured on a Moon Patrol board, is 56.75Hz. */)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790) /* accurate frequency, measured on a Moon Patrol board, is 56.75Hz. */)
/* the Lode Runner manual (similar but different hardware) */
/* talks about 55Hz and 1790ms vblank duration. */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(m57)
- MDRV_PALETTE_LENGTH(32*8+32*8)
+ MCFG_GFXDECODE(m57)
+ MCFG_PALETTE_LENGTH(32*8+32*8)
- MDRV_PALETTE_INIT(m57)
- MDRV_VIDEO_START(m57)
- MDRV_VIDEO_UPDATE(m57)
+ MCFG_PALETTE_INIT(m57)
+ MCFG_VIDEO_START(m57)
+ MCFG_VIDEO_UPDATE(m57)
/* sound hardware */
- MDRV_FRAGMENT_ADD(m52_sound_c_audio)
+ MCFG_FRAGMENT_ADD(m52_sound_c_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index 62a50d84357..cad74da87b7 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -191,24 +191,24 @@ GFXDECODE_END
static MACHINE_CONFIG_START( yard, m58_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(yard_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
+ MCFG_CPU_PROGRAM_MAP(yard_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_GFXDECODE(yard)
- MDRV_PALETTE_LENGTH(256+256+256)
+ MCFG_GFXDECODE(yard)
+ MCFG_PALETTE_LENGTH(256+256+256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 256, 282, 42, 266)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 256, 282, 42, 266)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_INIT(yard)
- MDRV_VIDEO_START(yard)
- MDRV_VIDEO_UPDATE(yard)
+ MCFG_PALETTE_INIT(yard)
+ MCFG_VIDEO_START(yard)
+ MCFG_VIDEO_UPDATE(yard)
/* sound hardware */
- MDRV_FRAGMENT_ADD(m52_large_audio)
+ MCFG_FRAGMENT_ADD(m52_large_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index 2abb9a56a9c..a95ad9179a0 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -958,202 +958,202 @@ static MACHINE_RESET( m62 )
static MACHINE_CONFIG_START( ldrun, m62_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 24000000/6)
- MDRV_CPU_PROGRAM_MAP(ldrun_map)
- MDRV_CPU_IO_MAP(kungfum_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 24000000/6)
+ MCFG_CPU_PROGRAM_MAP(ldrun_map)
+ MCFG_CPU_IO_MAP(kungfum_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(m62)
- MDRV_MACHINE_RESET(m62)
+ MCFG_MACHINE_START(m62)
+ MCFG_MACHINE_RESET(m62)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790) /* frames per second and vblank duration from the Lode Runner manual */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA((64*8-384)/2, 64*8-(64*8-384)/2-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790) /* frames per second and vblank duration from the Lode Runner manual */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA((64*8-384)/2, 64*8-(64*8-384)/2-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(ldrun)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(ldrun)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(m62)
- MDRV_VIDEO_START(ldrun)
- MDRV_VIDEO_UPDATE(ldrun)
+ MCFG_PALETTE_INIT(m62)
+ MCFG_VIDEO_START(ldrun)
+ MCFG_VIDEO_UPDATE(ldrun)
/* sound hardware */
- MDRV_FRAGMENT_ADD(m62_audio)
+ MCFG_FRAGMENT_ADD(m62_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kungfum, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(18432000/6)
- MDRV_CPU_PROGRAM_MAP(kungfum_map)
- MDRV_CPU_IO_MAP(kungfum_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(18432000/6)
+ MCFG_CPU_PROGRAM_MAP(kungfum_map)
+ MCFG_CPU_IO_MAP(kungfum_io_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1)
- MDRV_VIDEO_START(kungfum)
- MDRV_VIDEO_UPDATE(kungfum)
+ MCFG_VIDEO_START(kungfum)
+ MCFG_VIDEO_UPDATE(kungfum)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( battroad, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(18432000/6)
- MDRV_CPU_PROGRAM_MAP(battroad_map)
- MDRV_CPU_IO_MAP(battroad_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(18432000/6)
+ MCFG_CPU_PROGRAM_MAP(battroad_map)
+ MCFG_CPU_IO_MAP(battroad_io_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(battroad)
- MDRV_PALETTE_LENGTH(544)
-
- MDRV_PALETTE_INIT(battroad)
- MDRV_VIDEO_START(battroad)
- MDRV_VIDEO_UPDATE(battroad)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1)
+ MCFG_GFXDECODE(battroad)
+ MCFG_PALETTE_LENGTH(544)
+
+ MCFG_PALETTE_INIT(battroad)
+ MCFG_VIDEO_START(battroad)
+ MCFG_VIDEO_UPDATE(battroad)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ldrun2, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ldrun2_map)
- MDRV_CPU_IO_MAP(ldrun2_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ldrun2_map)
+ MCFG_CPU_IO_MAP(ldrun2_io_map)
- MDRV_VIDEO_START(ldrun2)
- MDRV_VIDEO_UPDATE(ldrun)
+ MCFG_VIDEO_START(ldrun2)
+ MCFG_VIDEO_UPDATE(ldrun)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ldrun3, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ldrun3_map)
- MDRV_CPU_IO_MAP(ldrun3_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ldrun3_map)
+ MCFG_CPU_IO_MAP(ldrun3_io_map)
/* video hardware */
- MDRV_GFXDECODE(ldrun3)
- MDRV_VIDEO_START(ldrun2)
- MDRV_VIDEO_UPDATE(ldrun3)
+ MCFG_GFXDECODE(ldrun3)
+ MCFG_VIDEO_START(ldrun2)
+ MCFG_VIDEO_UPDATE(ldrun3)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ldrun4, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ldrun4_map)
- MDRV_CPU_IO_MAP(ldrun4_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ldrun4_map)
+ MCFG_CPU_IO_MAP(ldrun4_io_map)
/* video hardware */
- MDRV_GFXDECODE(ldrun3)
- MDRV_VIDEO_START(ldrun4)
- MDRV_VIDEO_UPDATE(ldrun4)
+ MCFG_GFXDECODE(ldrun3)
+ MCFG_VIDEO_START(ldrun4)
+ MCFG_VIDEO_UPDATE(ldrun4)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lotlot, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lotlot_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(lotlot_map)
/* video hardware */
- MDRV_GFXDECODE(lotlot)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(lotlot)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_PALETTE_INIT(lotlot)
- MDRV_VIDEO_START(lotlot)
- MDRV_VIDEO_UPDATE(lotlot)
+ MCFG_PALETTE_INIT(lotlot)
+ MCFG_VIDEO_START(lotlot)
+ MCFG_VIDEO_UPDATE(lotlot)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kidniki, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kidniki_map)
- MDRV_CPU_IO_MAP(kidniki_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(kidniki_map)
+ MCFG_CPU_IO_MAP(kidniki_io_map)
/* video hardware */
- MDRV_GFXDECODE(kidniki)
+ MCFG_GFXDECODE(kidniki)
- MDRV_VIDEO_START(kidniki)
- MDRV_VIDEO_UPDATE(kidniki)
+ MCFG_VIDEO_START(kidniki)
+ MCFG_VIDEO_UPDATE(kidniki)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spelunkr, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spelunkr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spelunkr_map)
/* video hardware */
- MDRV_GFXDECODE(spelunkr)
+ MCFG_GFXDECODE(spelunkr)
- MDRV_VIDEO_START(spelunkr)
- MDRV_VIDEO_UPDATE(spelunkr)
+ MCFG_VIDEO_START(spelunkr)
+ MCFG_VIDEO_UPDATE(spelunkr)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spelunk2, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spelunk2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spelunk2_map)
/* video hardware */
- MDRV_GFXDECODE(spelunk2)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(spelunk2)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_PALETTE_INIT(spelunk2)
- MDRV_VIDEO_START(spelunk2)
- MDRV_VIDEO_UPDATE(spelunk2)
+ MCFG_PALETTE_INIT(spelunk2)
+ MCFG_VIDEO_START(spelunk2)
+ MCFG_VIDEO_UPDATE(spelunk2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( youjyudn, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(18432000/6)
- MDRV_CPU_PROGRAM_MAP(youjyudn_map)
- MDRV_CPU_IO_MAP(youjyudn_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(18432000/6)
+ MCFG_CPU_PROGRAM_MAP(youjyudn_map)
+ MCFG_CPU_IO_MAP(youjyudn_io_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(youjyudn)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1)
+ MCFG_GFXDECODE(youjyudn)
- MDRV_VIDEO_START(youjyudn)
- MDRV_VIDEO_UPDATE(youjyudn)
+ MCFG_VIDEO_START(youjyudn)
+ MCFG_VIDEO_UPDATE(youjyudn)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( horizon, ldrun )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(horizon_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(horizon_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1)
- MDRV_VIDEO_START(horizon)
- MDRV_VIDEO_UPDATE(horizon)
+ MCFG_VIDEO_START(horizon)
+ MCFG_VIDEO_UPDATE(horizon)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 48455da647e..cf6731897d3 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -733,87 +733,87 @@ static MACHINE_RESET( m63 )
static MACHINE_CONFIG_START( m63, m63_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,XTAL_12MHz/4) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(m63_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(m63_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("soundcpu",I8039,XTAL_12MHz/4) /* ????? */
- MDRV_CPU_PROGRAM_MAP(i8039_map)
- MDRV_CPU_IO_MAP(i8039_port_map)
- MDRV_CPU_PERIODIC_INT(snd_irq, 60)
+ MCFG_CPU_ADD("soundcpu",I8039,XTAL_12MHz/4) /* ????? */
+ MCFG_CPU_PROGRAM_MAP(i8039_map)
+ MCFG_CPU_IO_MAP(i8039_port_map)
+ MCFG_CPU_PERIODIC_INT(snd_irq, 60)
- MDRV_MACHINE_START(m63)
- MDRV_MACHINE_RESET(m63)
+ MCFG_MACHINE_START(m63)
+ MCFG_MACHINE_RESET(m63)
/* 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)
+ 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)
- MDRV_GFXDECODE(m63)
- MDRV_PALETTE_LENGTH(256+4)
+ MCFG_GFXDECODE(m63)
+ MCFG_PALETTE_LENGTH(256+4)
- MDRV_PALETTE_INIT(m63)
- MDRV_VIDEO_START(m63)
- MDRV_VIDEO_UPDATE(m63)
+ MCFG_PALETTE_INIT(m63)
+ MCFG_VIDEO_START(m63)
+ MCFG_VIDEO_UPDATE(m63)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono") /* ????? */
+ MCFG_SPEAKER_STANDARD_MONO("mono") /* ????? */
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* ????? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* ????? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( atomboy, m63 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PERIODIC_INT(snd_irq, 60/2)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PERIODIC_INT(snd_irq, 60/2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fghtbskt, m63_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(fghtbskt_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(fghtbskt_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("soundcpu", I8039,XTAL_12MHz/4) /* ????? */
- MDRV_CPU_PROGRAM_MAP(i8039_map)
- MDRV_CPU_IO_MAP(i8039_port_map)
- MDRV_CPU_PERIODIC_INT(snd_irq, 60/2)
+ MCFG_CPU_ADD("soundcpu", I8039,XTAL_12MHz/4) /* ????? */
+ MCFG_CPU_PROGRAM_MAP(i8039_map)
+ MCFG_CPU_IO_MAP(i8039_port_map)
+ MCFG_CPU_PERIODIC_INT(snd_irq, 60/2)
- MDRV_MACHINE_START(m63)
- MDRV_MACHINE_RESET(m63)
+ MCFG_MACHINE_START(m63)
+ MCFG_MACHINE_RESET(m63)
/* 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)
+ 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)
- MDRV_GFXDECODE(fghtbskt)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(fghtbskt)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(m63)
- MDRV_VIDEO_UPDATE(m63)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(m63)
+ MCFG_VIDEO_UPDATE(m63)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(fghtbskt_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(fghtbskt_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 9a9725d067d..666c8baa2f5 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -1794,55 +1794,55 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( m72_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(m72_map)
- MDRV_CPU_IO_MAP(m72_portmap)
+ MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(m72_map)
+ MCFG_CPU_IO_MAP(m72_portmap)
- MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_ram_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(m72)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(m72)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(m72)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m72)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(m72)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(m72)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( m72, m72_base )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( m72_8751, m72_base )
- MDRV_CPU_ADD("mcu",I8751, MASTER_CLOCK/4)
- MDRV_CPU_IO_MAP(mcu_io_map)
- MDRV_CPU_VBLANK_INT("screen", m72_mcu_int)
+ MCFG_CPU_ADD("mcu",I8751, MASTER_CLOCK/4)
+ MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", m72_mcu_int)
MACHINE_CONFIG_END
@@ -1850,519 +1850,519 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rtype, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(rtype_map)
- MDRV_CPU_IO_MAP(m72_portmap)
+ MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(rtype_map)
+ MCFG_CPU_IO_MAP(m72_portmap)
- MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map)
- MDRV_CPU_IO_MAP(rtype_sound_portmap)
+ MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_ram_map)
+ MCFG_CPU_IO_MAP(rtype_sound_portmap)
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(m72)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(m72)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(m72)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m72)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(m72)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(m72)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( xmultipl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(xmultipl_map)
- MDRV_CPU_IO_MAP(hharry_portmap)
-
- MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(xmultipl_map)
+ MCFG_CPU_IO_MAP(hharry_portmap)
+
+ MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_rom_map)
+ MCFG_CPU_IO_MAP(rtype2_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(xmultipl)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(xmultipl)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(m72)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m72)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(m72)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(m72)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( xmultiplm72, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(xmultiplm72_map)
- MDRV_CPU_IO_MAP(m72_portmap)
-
- MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(xmultiplm72_map)
+ MCFG_CPU_IO_MAP(m72_portmap)
+
+ MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_ram_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(xmultipl)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(xmultipl)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(m72)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m72)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(m72)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(m72)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dbreed, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(dbreed_map)
- MDRV_CPU_IO_MAP(hharry_portmap)
-
- MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(dbreed_map)
+ MCFG_CPU_IO_MAP(hharry_portmap)
+
+ MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_rom_map)
+ MCFG_CPU_IO_MAP(rtype2_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(xmultipl)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(xmultipl)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(rtype2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(rtype2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(hharry)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(hharry)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dbreedm72, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(dbreedm72_map)
- MDRV_CPU_IO_MAP(m72_portmap)
-
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(dbreedm72_map)
+ MCFG_CPU_IO_MAP(m72_portmap)
+
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_ram_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(xmultipl)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(xmultipl)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(m72)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m72)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(m72)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(m72)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rtype2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(rtype2_map)
- MDRV_CPU_IO_MAP(rtype2_portmap)
-
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(rtype2_map)
+ MCFG_CPU_IO_MAP(rtype2_portmap)
+
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_rom_map)
+ MCFG_CPU_IO_MAP(rtype2_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(m72)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(m72)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(rtype2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(rtype2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(rtype2)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(rtype2)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( majtitle, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(majtitle_map)
- MDRV_CPU_IO_MAP(majtitle_portmap)
-
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(majtitle_map)
+ MCFG_CPU_IO_MAP(majtitle_portmap)
+
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_rom_map)
+ MCFG_CPU_IO_MAP(rtype2_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(m72)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(m72)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(majtitle)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(majtitle)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(majtitle)
- MDRV_VIDEO_UPDATE(majtitle)
+ MCFG_VIDEO_START(majtitle)
+ MCFG_VIDEO_UPDATE(majtitle)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hharry, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(hharry_map)
- MDRV_CPU_IO_MAP(hharry_portmap)
-
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(hharry_map)
+ MCFG_CPU_IO_MAP(hharry_portmap)
+
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_rom_map)
+ MCFG_CPU_IO_MAP(rtype2_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(xmultipl)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(xmultipl)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(rtype2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(rtype2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(hharry)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(hharry)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hharryu, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(hharryu_map)
- MDRV_CPU_IO_MAP(rtype2_portmap)
-
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(hharryu_map)
+ MCFG_CPU_IO_MAP(rtype2_portmap)
+
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_rom_map)
+ MCFG_CPU_IO_MAP(rtype2_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(xmultipl)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(xmultipl)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(rtype2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(rtype2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(rtype2)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(rtype2)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dkgenm72, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(m72_map)
- MDRV_CPU_IO_MAP(m72_portmap)
-
- MDRV_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_ram_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(m72_map)
+ MCFG_CPU_IO_MAP(m72_portmap)
+
+ MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_ram_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(xmultipl)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(xmultipl)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(m72)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m72)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(m72)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(m72)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( poundfor, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MDRV_CPU_PROGRAM_MAP(rtype2_map)
- MDRV_CPU_IO_MAP(poundfor_portmap)
-
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map)
- MDRV_CPU_IO_MAP(poundfor_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_CPU_PROGRAM_MAP(rtype2_map)
+ MCFG_CPU_IO_MAP(poundfor_portmap)
+
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_rom_map)
+ MCFG_CPU_IO_MAP(poundfor_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(m72)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(m72)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(rtype2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(rtype2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(poundfor)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(poundfor)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cosmccop, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V35,MASTER_CLOCK/2/2)
- MDRV_CPU_PROGRAM_MAP(kengo_map)
- MDRV_CPU_IO_MAP(kengo_portmap)
-
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_rom_map)
- MDRV_CPU_IO_MAP(rtype2_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V35,MASTER_CLOCK/2/2)
+ MCFG_CPU_PROGRAM_MAP(kengo_map)
+ MCFG_CPU_IO_MAP(kengo_portmap)
+
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_rom_map)
+ MCFG_CPU_IO_MAP(rtype2_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_MACHINE_START(m72)
- MDRV_MACHINE_RESET(kengo)
+ MCFG_MACHINE_START(m72)
+ MCFG_MACHINE_RESET(kengo)
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_GFXDECODE(rtype2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(rtype2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 512, 64, 448, 284, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(poundfor)
- MDRV_VIDEO_UPDATE(m72)
+ MCFG_VIDEO_START(poundfor)
+ MCFG_VIDEO_UPDATE(m72)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static const nec_config kengo_config ={ gunforce_decryption_table, };
static MACHINE_CONFIG_DERIVED( kengo, cosmccop )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(kengo_config)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(kengo_config)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index 30260417c01..b49b544f0c3 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -206,27 +206,27 @@ static INTERRUPT_GEN( m79amb_interrupt )
static MACHINE_CONFIG_START( m79amb, m79amb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, XTAL_19_6608MHz / 10)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", m79amb_interrupt)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL_19_6608MHz / 10)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", m79amb_interrupt)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
- MDRV_VIDEO_UPDATE(ramtek)
+ MCFG_VIDEO_UPDATE(ramtek)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(m79amb)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(m79amb)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 8a5e9cbe787..09db27c67d3 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -689,85 +689,85 @@ static INTERRUPT_GEN( bomblord_interrupt )
/* Basic hardware -- no decryption table is setup for CPU */
static MACHINE_CONFIG_START( m90, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V35,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */
- MDRV_CPU_PROGRAM_MAP(m90_main_cpu_map)
- MDRV_CPU_IO_MAP(m90_main_cpu_io_map)
- MDRV_CPU_VBLANK_INT("screen", m90_interrupt)
-
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
- MDRV_CPU_IO_MAP(m90_sound_cpu_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V35,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */
+ MCFG_CPU_PROGRAM_MAP(m90_main_cpu_map)
+ MCFG_CPU_IO_MAP(m90_main_cpu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", m90_interrupt)
+
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MCFG_CPU_IO_MAP(m90_sound_cpu_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8, 47*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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8, 47*8-1)
- MDRV_GFXDECODE(m90)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m90)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(m90)
- MDRV_VIDEO_UPDATE(m90)
+ MCFG_VIDEO_START(m90)
+ MCFG_VIDEO_UPDATE(m90)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static const nec_config hasamu_config ={ gunforce_decryption_table, };
static MACHINE_CONFIG_DERIVED( hasamu, m90 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(hasamu_config)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(hasamu_config)
MACHINE_CONFIG_END
static const nec_config quizf1_config ={ lethalth_decryption_table, };
static MACHINE_CONFIG_DERIVED( quizf1, m90 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(quizf1_config)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(quizf1_config)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8)
MACHINE_CONFIG_END
static const nec_config matchit2_config ={ matchit2_decryption_table, };
static MACHINE_CONFIG_DERIVED( matchit2, m90 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(matchit2_config)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(matchit2_config)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8)
MACHINE_CONFIG_END
static const nec_config riskchal_config ={ gussun_decryption_table, };
static MACHINE_CONFIG_DERIVED( riskchal, m90 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(riskchal_config)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(riskchal_config)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
MACHINE_CONFIG_END
static const nec_config bomberman_config ={ bomberman_decryption_table, };
static MACHINE_CONFIG_DERIVED( bombrman, m90 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(bomberman_config)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(bomberman_config)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
MACHINE_CONFIG_END
static const nec_config dynablaster_config ={ dynablaster_decryption_table, };
@@ -775,110 +775,110 @@ static const nec_config dynablaster_config ={ dynablaster_decryption_table, };
static MACHINE_CONFIG_START( bbmanw, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V35,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */
- MDRV_CPU_CONFIG(dynablaster_config)
- MDRV_CPU_PROGRAM_MAP(m90_main_cpu_map)
- MDRV_CPU_IO_MAP(m90_main_cpu_io_map)
- MDRV_CPU_VBLANK_INT("screen", m90_interrupt)
-
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
- MDRV_CPU_IO_MAP(bbmanw_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V35,XTAL_32MHz/2/2) /* verified clock on cpu is 16Mhz but probably divided internally by 2 */
+ MCFG_CPU_CONFIG(dynablaster_config)
+ MCFG_CPU_PROGRAM_MAP(m90_main_cpu_map)
+ MCFG_CPU_IO_MAP(m90_main_cpu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", m90_interrupt)
+
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MCFG_CPU_IO_MAP(bbmanw_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
- MDRV_GFXDECODE(m90)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m90)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(m90)
- MDRV_VIDEO_UPDATE(m90)
+ MCFG_VIDEO_START(m90)
+ MCFG_VIDEO_UPDATE(m90)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static const nec_config no_table ={ NULL, };
static MACHINE_CONFIG_DERIVED( bbmanwj, bbmanw )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
- MDRV_CPU_IO_MAP(m90_sound_cpu_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MCFG_CPU_IO_MAP(m90_sound_cpu_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bomblord, bbmanw )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(no_table)
- MDRV_CPU_PROGRAM_MAP(bomblord_main_cpu_map)
- MDRV_CPU_IO_MAP(dynablsb_cpu_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(no_table)
+ MCFG_CPU_PROGRAM_MAP(bomblord_main_cpu_map)
+ MCFG_CPU_IO_MAP(dynablsb_cpu_io_map)
- MDRV_VIDEO_START(bomblord)
- MDRV_VIDEO_UPDATE(bomblord)
+ MCFG_VIDEO_START(bomblord)
+ MCFG_VIDEO_UPDATE(bomblord)
- MDRV_CPU_VBLANK_INT("screen", bomblord_interrupt)
+ MCFG_CPU_VBLANK_INT("screen", bomblord_interrupt)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dynablsb, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,32000000/4)
- MDRV_CPU_PROGRAM_MAP(dynablsb_main_cpu_map)
- MDRV_CPU_IO_MAP(dynablsb_cpu_io_map)
- MDRV_CPU_VBLANK_INT("screen", m90_interrupt)
-
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(m90_sound_cpu_map)
- MDRV_CPU_IO_MAP(m90_sound_cpu_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", V30,32000000/4)
+ MCFG_CPU_PROGRAM_MAP(dynablsb_main_cpu_map)
+ MCFG_CPU_IO_MAP(dynablsb_cpu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", m90_interrupt)
+
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_3_579545MHz) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(m90_sound_cpu_map)
+ MCFG_CPU_IO_MAP(m90_sound_cpu_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(m90)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(m90)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(dynablsb)
- MDRV_VIDEO_UPDATE(dynablsb)
+ MCFG_VIDEO_START(dynablsb)
+ MCFG_VIDEO_UPDATE(dynablsb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 3c28807135b..c51f5e5212f 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -920,165 +920,165 @@ void m92_sprite_interrupt(running_machine *machine)
static MACHINE_CONFIG_START( m92, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",V33,18000000/2) /* NEC V33, 18 MHz clock */
- MDRV_CPU_PROGRAM_MAP(m92_map)
- MDRV_CPU_IO_MAP(m92_portmap)
+ MCFG_CPU_ADD("maincpu",V33,18000000/2) /* NEC V33, 18 MHz clock */
+ MCFG_CPU_PROGRAM_MAP(m92_map)
+ MCFG_CPU_IO_MAP(m92_portmap)
- MDRV_CPU_ADD("soundcpu" ,V35, 14318180/2) /* 14.31818 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("soundcpu" ,V35, 14318180/2) /* 14.31818 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(m92)
- MDRV_MACHINE_RESET(m92)
+ MCFG_MACHINE_START(m92)
+ MCFG_MACHINE_RESET(m92)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(80, 511-112, 8, 247) /* 320 x 240 */
+ 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(80, 511-112, 8, 247) /* 320 x 240 */
- MDRV_GFXDECODE(m92)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(m92)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(m92)
- MDRV_VIDEO_UPDATE(m92)
+ MCFG_VIDEO_START(m92)
+ MCFG_VIDEO_UPDATE(m92)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 14318180/4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MDRV_SOUND_ADD("irem", IREMGA20, 14318180/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("irem", IREMGA20, 14318180/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static const nec_config gunforce_config ={ gunforce_decryption_table, };
static MACHINE_CONFIG_DERIVED( gunforce, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(gunforce_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(gunforce_config)
MACHINE_CONFIG_END
static const nec_config bmaster_config ={ bomberman_decryption_table, };
static MACHINE_CONFIG_DERIVED( bmaster, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(bmaster_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(bmaster_config)
MACHINE_CONFIG_END
static const nec_config lethalth_config ={ lethalth_decryption_table, };
static MACHINE_CONFIG_DERIVED( lethalth, m92 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lethalth_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(lethalth_config)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(lethalth_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(lethalth_config)
MACHINE_CONFIG_END
static const nec_config uccops_config ={ dynablaster_decryption_table, };
static MACHINE_CONFIG_DERIVED( uccops, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(uccops_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(uccops_config)
MACHINE_CONFIG_END
static const nec_config mysticri_config ={ mysticri_decryption_table, };
static MACHINE_CONFIG_DERIVED( mysticri, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(mysticri_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(mysticri_config)
MACHINE_CONFIG_END
static const nec_config majtitl2_config ={ majtitl2_decryption_table, };
static MACHINE_CONFIG_DERIVED( majtitl2, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(majtitl2_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(majtitl2_config)
MACHINE_CONFIG_END
static const nec_config hook_config ={ hook_decryption_table, };
static MACHINE_CONFIG_DERIVED( hook, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(hook_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(hook_config)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ppan, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",V33,18000000/2)
- MDRV_CPU_PROGRAM_MAP(m92_map)
- MDRV_CPU_IO_MAP(m92_portmap)
+ MCFG_CPU_ADD("maincpu",V33,18000000/2)
+ MCFG_CPU_PROGRAM_MAP(m92_map)
+ MCFG_CPU_IO_MAP(m92_portmap)
/* no Sound CPU */
- MDRV_MACHINE_START(m92)
- MDRV_MACHINE_RESET(m92)
+ MCFG_MACHINE_START(m92)
+ MCFG_MACHINE_RESET(m92)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(80, 511-112, 8, 247) /* 320 x 240 */
+ 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(80, 511-112, 8, 247) /* 320 x 240 */
- MDRV_GFXDECODE(m92)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(m92)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(m92)
- MDRV_VIDEO_UPDATE(m92)
+ MCFG_VIDEO_START(m92)
+ MCFG_VIDEO_UPDATE(m92)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static const nec_config rtypeleo_config ={ rtypeleo_decryption_table, };
static MACHINE_CONFIG_DERIVED( rtypeleo, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(rtypeleo_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(rtypeleo_config)
MACHINE_CONFIG_END
static const nec_config inthunt_config ={ inthunt_decryption_table, };
static MACHINE_CONFIG_DERIVED( inthunt, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(inthunt_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(inthunt_config)
MACHINE_CONFIG_END
static const nec_config nbbatman_config ={ leagueman_decryption_table, };
static MACHINE_CONFIG_DERIVED( nbbatman, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(nbbatman_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(nbbatman_config)
MACHINE_CONFIG_END
static const nec_config psoldier_config ={ psoldier_decryption_table, };
static MACHINE_CONFIG_DERIVED( psoldier, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(psoldier_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(psoldier_config)
/* video hardware */
- MDRV_GFXDECODE(2)
+ MCFG_GFXDECODE(2)
MACHINE_CONFIG_END
static const nec_config dsoccr94_config ={ dsoccr94_decryption_table, };
static MACHINE_CONFIG_DERIVED( dsoccr94j, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(dsoccr94_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(dsoccr94_config)
/* video hardware */
- MDRV_GFXDECODE(2)
+ MCFG_GFXDECODE(2)
MACHINE_CONFIG_END
static const nec_config gunforc2_config ={ lethalth_decryption_table, };
static MACHINE_CONFIG_DERIVED( gunforc2, m92 )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CONFIG(gunforc2_config)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CONFIG(gunforc2_config)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index b3787ac7112..85513406481 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -628,44 +628,44 @@ static MACHINE_RESET( macrossp )
static MACHINE_CONFIG_START( macrossp, macrossp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 50000000/2) /* 25 MHz */
- MDRV_CPU_PROGRAM_MAP(macrossp_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold) // there are others ...
+ MCFG_CPU_ADD("maincpu", M68EC020, 50000000/2) /* 25 MHz */
+ MCFG_CPU_PROGRAM_MAP(macrossp_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold) // there are others ...
- MDRV_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(macrossp_sound_map)
+ MCFG_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(macrossp_sound_map)
- MDRV_MACHINE_START(macrossp)
- MDRV_MACHINE_RESET(macrossp)
+ MCFG_MACHINE_START(macrossp)
+ MCFG_MACHINE_RESET(macrossp)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(32*16, 16*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 0*16, 15*16-1)
+ 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(32*16, 16*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 0*16, 15*16-1)
- MDRV_GFXDECODE(macrossp)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(macrossp)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(macrossp)
- MDRV_VIDEO_EOF(macrossp)
- MDRV_VIDEO_UPDATE(macrossp)
+ MCFG_VIDEO_START(macrossp)
+ MCFG_VIDEO_EOF(macrossp)
+ MCFG_VIDEO_UPDATE(macrossp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ensoniq", ES5506, 16000000)
- MDRV_SOUND_CONFIG(es5506_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ensoniq", ES5506, 16000000)
+ MCFG_SOUND_CONFIG(es5506_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizmoon, macrossp )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 24*16-1, 0*8, 14*16-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 24*16-1, 0*8, 14*16-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index 31552a773d6..57b2a9bb09b 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -459,34 +459,34 @@ static const st0016_interface st0016_config =
static MACHINE_CONFIG_START( macs, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(macs_mem)
- MDRV_CPU_IO_MAP(macs_io)
+ MCFG_CPU_ADD("maincpu",Z80,8000000) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(macs_mem)
+ MCFG_CPU_IO_MAP(macs_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(macs)
+ MCFG_MACHINE_RESET(macs)
/* 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(128*8, 128*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 128*8-1, 0*8, 128*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(128*8, 128*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 128*8-1, 0*8, 128*8-1)
- MDRV_GFXDECODE(macs)
- MDRV_PALETTE_LENGTH(16*16*4+1)
+ MCFG_GFXDECODE(macs)
+ MCFG_PALETTE_LENGTH(16*16*4+1)
- MDRV_VIDEO_START(st0016)
- MDRV_VIDEO_UPDATE(st0016)
+ MCFG_VIDEO_START(st0016)
+ MCFG_VIDEO_UPDATE(st0016)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("stsnd", ST0016, 0)
- MDRV_SOUND_CONFIG(st0016_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("stsnd", ST0016, 0)
+ MCFG_SOUND_CONFIG(st0016_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index c63b1f055a4..d2a8faefbed 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -175,29 +175,29 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( madalien, driver_device )
/* main CPU */
- MDRV_CPU_ADD("maincpu", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("audiocpu", M6502, SOUND_CLOCK / 8) /* 512kHz */
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("audiocpu", M6502, SOUND_CLOCK / 8) /* 512kHz */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
- MDRV_FRAGMENT_ADD(madalien_video)
+ MCFG_FRAGMENT_ADD(madalien_video)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK / 4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
- MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 1)
- MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 2)
+ MCFG_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK / 4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
+ MCFG_SOUND_ROUTE_EX(1, "discrete", 1.0, 1)
+ MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 2)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(madalien)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(madalien)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 9a5742311f0..ea4439a461c 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -243,48 +243,48 @@ static MACHINE_RESET( madmotor )
static MACHINE_CONFIG_START( madmotor, madmotor_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */
- MDRV_CPU_PROGRAM_MAP(madmotor_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */
+ MCFG_CPU_PROGRAM_MAP(madmotor_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", H6280, 8053000/2) /* Custom chip 45, Crystal near CPU is 8.053 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 8053000/2) /* Custom chip 45, Crystal near CPU is 8.053 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(madmotor)
- MDRV_MACHINE_RESET(madmotor)
+ MCFG_MACHINE_START(madmotor)
+ MCFG_MACHINE_RESET(madmotor)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* frames per second, vblank duration taken from Burger Time */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* frames per second, vblank duration taken from Burger Time */)
+ 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)
- MDRV_GFXDECODE(madmotor)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(madmotor)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(madmotor)
- MDRV_VIDEO_UPDATE(madmotor)
+ MCFG_VIDEO_START(madmotor)
+ MCFG_VIDEO_UPDATE(madmotor)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 21470000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, 21470000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM2151, 21470000/6)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ym2", YM2151, 21470000/6)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki1", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki1", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki2", 2047848, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_OKIM6295_ADD("oki2", 2047848, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 66049705a6e..351cfe73ee7 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -648,71 +648,71 @@ GFXDECODE_END
static MACHINE_CONFIG_START( magic10, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) // ?
- MDRV_CPU_PROGRAM_MAP(magic10_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) // ?
+ MCFG_CPU_PROGRAM_MAP(magic10_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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, 44*8-1, 2*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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 2*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_GFXDECODE(magic10)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(magic10)
- MDRV_VIDEO_START(magic10)
- MDRV_VIDEO_UPDATE(magic10)
+ MCFG_VIDEO_START(magic10)
+ MCFG_VIDEO_UPDATE(magic10)
/* sound hardware */
- MDRV_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_SPEAKER_STANDARD_MONO("mono")
+ 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_DERIVED( magic10a, magic10 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magic10a_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(magic10a_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( magic102, magic10 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magic102_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(magic102_map)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hotslot, magic10 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hotslot_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hotslot_map)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 2*8, 32*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 2*8, 32*8-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sgsafari, magic10 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sgsafari_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold) /* L1 interrupts */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sgsafari_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold) /* L1 interrupts */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c
index e3a8635551a..72eaaac43af 100644
--- a/src/mame/drivers/magicard.c
+++ b/src/mame/drivers/magicard.c
@@ -624,27 +624,27 @@ static INTERRUPT_GEN( magicard_irq )
}
static MACHINE_CONFIG_START( magicard, driver_device )
- MDRV_CPU_ADD("maincpu", SCC68070, CLOCK_A/2) /* SCC-68070 CCA84 datasheet */
- MDRV_CPU_PROGRAM_MAP(magicard_mem)
- MDRV_CPU_VBLANK_INT("screen", magicard_irq) /* no interrupts? (it erases the vectors..) */
+ MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2) /* SCC-68070 CCA84 datasheet */
+ MCFG_CPU_PROGRAM_MAP(magicard_mem)
+ MCFG_CPU_VBLANK_INT("screen", magicard_irq) /* no interrupts? (it erases the vectors..) */
- 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(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1) //dynamic resolution,TODO
+ 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(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1) //dynamic resolution,TODO
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(magicard)
- MDRV_VIDEO_UPDATE(magicard)
+ MCFG_VIDEO_START(magicard)
+ MCFG_VIDEO_UPDATE(magicard)
- MDRV_MACHINE_RESET(magicard)
+ MCFG_MACHINE_RESET(magicard)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, CLOCK_A/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, CLOCK_A/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index 8538d0c29da..1d5f59a3119 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -759,33 +759,33 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( magicfly, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/12) /* guess */
- MDRV_CPU_PROGRAM_MAP(magicfly_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/12) /* guess */
+ MCFG_CPU_PROGRAM_MAP(magicfly_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((39+1)*8, (31+1)*8) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1). */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 29*8-1) /* Taken from MC6845 init, registers 01 & 06. */
+ 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) /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1). */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 29*8-1) /* Taken from MC6845 init, registers 01 & 06. */
- MDRV_GFXDECODE(magicfly)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(magicfly)
+ MCFG_GFXDECODE(magicfly)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(magicfly)
- MDRV_VIDEO_START(magicfly)
- MDRV_VIDEO_UPDATE(magicfly)
+ MCFG_VIDEO_START(magicfly)
+ MCFG_VIDEO_UPDATE(magicfly)
- 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")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( 7mezzo, magicfly )
@@ -793,7 +793,7 @@ static MACHINE_CONFIG_DERIVED( 7mezzo, magicfly )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_START(7mezzo)
+ MCFG_VIDEO_START(7mezzo)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c
index a45f2f786c4..cf63071aae7 100644
--- a/src/mame/drivers/magictg.c
+++ b/src/mame/drivers/magictg.c
@@ -141,21 +141,21 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_START( magictg, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R4600BE, 10000000) // ?? what cpu?
- MDRV_CPU_CONFIG(r4600_config)
- MDRV_CPU_PROGRAM_MAP(magictg_map)
+ MCFG_CPU_ADD("maincpu", R4600BE, 10000000) // ?? what cpu?
+ MCFG_CPU_CONFIG(r4600_config)
+ MCFG_CPU_PROGRAM_MAP(magictg_map)
- 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, 511, 16, 447)
+ 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, 511, 16, 447)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(magictg)
- MDRV_VIDEO_UPDATE(magictg)
+ MCFG_VIDEO_START(magictg)
+ MCFG_VIDEO_UPDATE(magictg)
MACHINE_CONFIG_END
static INPUT_PORTS_START( magictg )
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 6fac3740fc8..1e8bd2ddaf2 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -351,45 +351,45 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( magmax, magmax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(magmax_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(magmax_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_20MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(magmax_sound_map)
- MDRV_CPU_IO_MAP(magmax_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_20MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(magmax_sound_map)
+ MCFG_CPU_IO_MAP(magmax_sound_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(magmax)
- MDRV_MACHINE_RESET(magmax)
+ MCFG_MACHINE_START(magmax)
+ MCFG_MACHINE_RESET(magmax)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ 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)
- MDRV_GFXDECODE(magmax)
- MDRV_PALETTE_LENGTH(1*16 + 16*16 + 256)
+ MCFG_GFXDECODE(magmax)
+ MCFG_PALETTE_LENGTH(1*16 + 16*16 + 256)
- MDRV_PALETTE_INIT(magmax)
- MDRV_VIDEO_START(magmax)
- MDRV_VIDEO_UPDATE(magmax)
+ MCFG_PALETTE_INIT(magmax)
+ MCFG_VIDEO_START(magmax)
+ MCFG_VIDEO_UPDATE(magmax)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_20MHz/16) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_20MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ay3", AY8910, XTAL_20MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay3", AY8910, XTAL_20MHz/16) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c
index 45988741b64..16d982f3d61 100644
--- a/src/mame/drivers/magtouch.c
+++ b/src/mame/drivers/magtouch.c
@@ -194,23 +194,23 @@ static MACHINE_START( magtouch )
static MACHINE_CONFIG_START( magtouch, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
- MDRV_CPU_PROGRAM_MAP(magtouch_map)
- MDRV_CPU_IO_MAP(magtouch_io)
+ MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
+ MCFG_CPU_PROGRAM_MAP(magtouch_map)
+ MCFG_CPU_IO_MAP(magtouch_io)
/* video hardware */
- MDRV_FRAGMENT_ADD( pcvideo_vga )
+ MCFG_FRAGMENT_ADD( pcvideo_vga )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MDRV_MACHINE_START(magtouch)
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_MACHINE_START(magtouch)
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
-// MDRV_FRAGMENT_ADD( at_kbdc8042 )
- MDRV_FRAGMENT_ADD( pcat_common )
- MDRV_NS16450_ADD( "ns16450_0", magtouch_com0_interface )
+// MCFG_FRAGMENT_ADD( at_kbdc8042 )
+ MCFG_FRAGMENT_ADD( pcat_common )
+ MCFG_NS16450_ADD( "ns16450_0", magtouch_com0_interface )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 85160b9a541..838470a411d 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -442,45 +442,45 @@ static MACHINE_RESET( mainevt )
static MACHINE_CONFIG_START( mainevt, mainevt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */
- MDRV_CPU_PROGRAM_MAP(mainevt_map)
- MDRV_CPU_VBLANK_INT("screen", mainevt_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(mainevt_map)
+ MCFG_CPU_VBLANK_INT("screen", mainevt_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(mainevt_sound_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,8*60) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(mainevt_sound_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,8*60) /* ??? */
- MDRV_MACHINE_START(mainevt)
- MDRV_MACHINE_RESET(mainevt)
+ MCFG_MACHINE_START(mainevt)
+ MCFG_MACHINE_RESET(mainevt)
/* 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(14*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(mainevt)
- MDRV_VIDEO_UPDATE(mainevt)
+ MCFG_VIDEO_START(mainevt)
+ MCFG_VIDEO_UPDATE(mainevt)
- MDRV_K052109_ADD("k052109", mainevt_k052109_intf)
- MDRV_K051960_ADD("k051960", mainevt_k051960_intf)
+ MCFG_K052109_ADD("k052109", mainevt_k052109_intf)
+ MCFG_K051960_ADD("k051960", mainevt_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -503,47 +503,47 @@ static const k051960_interface dv_k051960_intf =
static MACHINE_CONFIG_START( devstors, mainevt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */
- MDRV_CPU_PROGRAM_MAP(devstors_map)
- MDRV_CPU_VBLANK_INT("screen", dv_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(devstors_map)
+ MCFG_CPU_VBLANK_INT("screen", dv_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(devstors_sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(devstors_sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ??? */
- MDRV_MACHINE_START(mainevt)
- MDRV_MACHINE_RESET(mainevt)
+ MCFG_MACHINE_START(mainevt)
+ MCFG_MACHINE_RESET(mainevt)
/* 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 )
+ 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 )
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(dv)
- MDRV_VIDEO_UPDATE(dv)
+ MCFG_VIDEO_START(dv)
+ MCFG_VIDEO_UPDATE(dv)
- MDRV_K052109_ADD("k052109", dv_k052109_intf)
- MDRV_K051960_ADD("k051960", dv_k051960_intf)
- MDRV_K051733_ADD("k051733")
+ MCFG_K052109_ADD("k052109", dv_k052109_intf)
+ MCFG_K051960_ADD("k051960", dv_k051960_intf)
+ MCFG_K051733_ADD("k051733")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index d0fb18d3200..fe66cdfb4ac 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -392,38 +392,38 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mainsnk, mainsnk_state )
- MDRV_CPU_ADD("maincpu", Z80, 3360000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 3360000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 244)
+ MCFG_CPU_ADD("audiocpu", Z80,4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 244)
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
- MDRV_GFXDECODE(mainsnk)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(mainsnk)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(tnk3)
- MDRV_VIDEO_START(mainsnk)
- MDRV_VIDEO_UPDATE(mainsnk)
+ MCFG_PALETTE_INIT(tnk3)
+ MCFG_VIDEO_START(mainsnk)
+ MCFG_VIDEO_UPDATE(mainsnk)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ay2", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index 20e6215519e..5e26dddf596 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -398,55 +398,55 @@ static MACHINE_RESET( malzak )
static MACHINE_CONFIG_START( malzak, malzak_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, 3800000/4)
- MDRV_CPU_PROGRAM_MAP(malzak_map)
- MDRV_CPU_IO_MAP(malzak_io_map)
+ MCFG_CPU_ADD("maincpu", S2650, 3800000/4)
+ MCFG_CPU_PROGRAM_MAP(malzak_map)
+ MCFG_CPU_IO_MAP(malzak_io_map)
- MDRV_MACHINE_START(malzak)
- MDRV_MACHINE_RESET(malzak)
+ MCFG_MACHINE_START(malzak)
+ MCFG_MACHINE_RESET(malzak)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- //MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(SAA5050_VBLANK))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(480, 512) /* vert size is a guess */
- MDRV_SCREEN_VISIBLE_AREA(0, 479, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ //MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(SAA5050_VBLANK))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(480, 512) /* vert size is a guess */
+ MCFG_SCREEN_VISIBLE_AREA(0, 479, 0, 479)
- MDRV_GFXDECODE(malzak)
- MDRV_PALETTE_LENGTH(128)
- MDRV_PALETTE_INIT(malzak)
+ MCFG_GFXDECODE(malzak)
+ MCFG_PALETTE_LENGTH(128)
+ MCFG_PALETTE_INIT(malzak)
- MDRV_S2636_ADD("s2636_0", malzac_s2636_0_config)
- MDRV_S2636_ADD("s2636_1", malzac_s2636_1_config)
+ MCFG_S2636_ADD("s2636_0", malzac_s2636_0_config)
+ MCFG_S2636_ADD("s2636_1", malzac_s2636_1_config)
- MDRV_SAA5050_ADD("saa5050", malzac_saa5050_intf)
- MDRV_VIDEO_UPDATE(malzak)
+ MCFG_SAA5050_ADD("saa5050", malzac_saa5050_intf)
+ MCFG_VIDEO_UPDATE(malzak)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76477, 0)
- MDRV_SOUND_CONFIG(sn76477_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("sn1", SN76477, 0)
+ MCFG_SOUND_CONFIG(sn76477_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("sn2", SN76477, 0)
- MDRV_SOUND_CONFIG(sn76477_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("sn2", SN76477, 0)
+ MCFG_SOUND_CONFIG(sn76477_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("s2636snd_0", S2636_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("s2636snd_0", S2636_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("s2636snd_1", S2636_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("s2636snd_1", S2636_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( malzak2, malzak )
- MDRV_CPU_MODIFY( "maincpu" )
- MDRV_CPU_PROGRAM_MAP(malzak2_map)
+ MCFG_CPU_MODIFY( "maincpu" )
+ MCFG_CPU_PROGRAM_MAP(malzak2_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
ROM_START( malzak )
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index d44b6397aa0..30229ad43c0 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -1605,195 +1605,195 @@ static const namcoio_interface intf1_interleave =
static MACHINE_CONFIG_START( superpac, mappy_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(superpac_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", superpac_interrupt_1) // also update the custom I/O chips
+ MCFG_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(superpac_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", superpac_interrupt_1) // also update the custom I/O chips
- MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(superpac_cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(superpac_cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_RESET(superpac)
+ MCFG_MACHINE_RESET(superpac)
- MDRV_NAMCO56XX_ADD("namcoio_1", intf0)
- MDRV_NAMCO56XX_ADD("namcoio_2", intf1)
+ MCFG_NAMCO56XX_ADD("namcoio_1", intf0)
+ MCFG_NAMCO56XX_ADD("namcoio_2", intf1)
/* video hardware */
- MDRV_GFXDECODE(superpac)
- MDRV_PALETTE_LENGTH(64*4+64*4)
+ MCFG_GFXDECODE(superpac)
+ MCFG_PALETTE_LENGTH(64*4+64*4)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(superpac)
- MDRV_VIDEO_START(superpac)
- MDRV_VIDEO_UPDATE(superpac)
+ MCFG_PALETTE_INIT(superpac)
+ MCFG_VIDEO_START(superpac)
+ MCFG_VIDEO_UPDATE(superpac)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pacnpal, superpac )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", pacnpal_interrupt_1) // also update the custom I/O chips
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", pacnpal_interrupt_1) // also update the custom I/O chips
- MDRV_DEVICE_REMOVE("namcoio_1")
- MDRV_DEVICE_REMOVE("namcoio_2")
- MDRV_NAMCO56XX_ADD("namcoio_1", intf0_lamps)
- MDRV_NAMCO59XX_ADD("namcoio_2", intf1)
+ MCFG_DEVICE_REMOVE("namcoio_1")
+ MCFG_DEVICE_REMOVE("namcoio_2")
+ MCFG_NAMCO56XX_ADD("namcoio_1", intf0_lamps)
+ MCFG_NAMCO59XX_ADD("namcoio_2", intf1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( grobda, superpac )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", phozon_interrupt_1) // also update the custom I/O chips
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", phozon_interrupt_1) // also update the custom I/O chips
- MDRV_DEVICE_REMOVE("namcoio_1")
- MDRV_DEVICE_REMOVE("namcoio_2")
- MDRV_NAMCO58XX_ADD("namcoio_1", intf0)
- MDRV_NAMCO56XX_ADD("namcoio_2", intf1)
+ MCFG_DEVICE_REMOVE("namcoio_1")
+ MCFG_DEVICE_REMOVE("namcoio_2")
+ MCFG_NAMCO58XX_ADD("namcoio_1", intf0)
+ MCFG_NAMCO56XX_ADD("namcoio_2", intf1)
/* sound hardware */
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( phozon, mappy_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* MAIN CPU */
- MDRV_CPU_PROGRAM_MAP(phozon_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", phozon_interrupt_1) // also update the custom I/O chips
+ MCFG_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* MAIN CPU */
+ MCFG_CPU_PROGRAM_MAP(phozon_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", phozon_interrupt_1) // also update the custom I/O chips
- MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* SOUND CPU */
- MDRV_CPU_PROGRAM_MAP(phozon_cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* SOUND CPU */
+ MCFG_CPU_PROGRAM_MAP(phozon_cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub2", M6809, PIXEL_CLOCK/4) /* SUB CPU */
- MDRV_CPU_PROGRAM_MAP(phozon_cpu3_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub2", M6809, PIXEL_CLOCK/4) /* SUB CPU */
+ MCFG_CPU_PROGRAM_MAP(phozon_cpu3_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_RESET(phozon)
+ MCFG_MACHINE_RESET(phozon)
- MDRV_NAMCO58XX_ADD("namcoio_1", intf0)
- MDRV_NAMCO56XX_ADD("namcoio_2", intf1_interleave)
+ MCFG_NAMCO58XX_ADD("namcoio_1", intf0)
+ MCFG_NAMCO56XX_ADD("namcoio_2", intf1_interleave)
/* video hardware */
- MDRV_GFXDECODE(phozon)
- MDRV_PALETTE_LENGTH(64*4+64*4)
+ MCFG_GFXDECODE(phozon)
+ MCFG_PALETTE_LENGTH(64*4+64*4)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(phozon)
- MDRV_VIDEO_START(phozon)
- MDRV_VIDEO_UPDATE(phozon)
+ MCFG_PALETTE_INIT(phozon)
+ MCFG_VIDEO_START(phozon)
+ MCFG_VIDEO_UPDATE(phozon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mappy, mappy_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(mappy_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", mappy_interrupt_1) // also update the custom I/O chips
+ MCFG_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(mappy_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", mappy_interrupt_1) // also update the custom I/O chips
- MDRV_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(mappy_cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(mappy_cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_RESET(mappy)
+ MCFG_MACHINE_RESET(mappy)
- MDRV_NAMCO58XX_ADD("namcoio_1", intf0)
- MDRV_NAMCO58XX_ADD("namcoio_2", intf1)
+ MCFG_NAMCO58XX_ADD("namcoio_1", intf0)
+ MCFG_NAMCO58XX_ADD("namcoio_2", intf1)
/* video hardware */
- MDRV_GFXDECODE(mappy)
- MDRV_PALETTE_LENGTH(64*4+16*16)
+ MCFG_GFXDECODE(mappy)
+ MCFG_PALETTE_LENGTH(64*4+16*16)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(mappy)
- MDRV_VIDEO_START(mappy)
- MDRV_VIDEO_UPDATE(mappy)
+ MCFG_PALETTE_INIT(mappy)
+ MCFG_VIDEO_START(mappy)
+ MCFG_VIDEO_UPDATE(mappy)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( digdug2, mappy )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", phozon_interrupt_1) // also update the custom I/O chips
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", phozon_interrupt_1) // also update the custom I/O chips
- MDRV_WATCHDOG_VBLANK_INIT(0)
+ MCFG_WATCHDOG_VBLANK_INIT(0)
- MDRV_DEVICE_REMOVE("namcoio_1")
- MDRV_DEVICE_REMOVE("namcoio_2")
- MDRV_NAMCO58XX_ADD("namcoio_1", intf0)
- MDRV_NAMCO56XX_ADD("namcoio_2", intf1)
+ MCFG_DEVICE_REMOVE("namcoio_1")
+ MCFG_DEVICE_REMOVE("namcoio_2")
+ MCFG_NAMCO58XX_ADD("namcoio_1", intf0)
+ MCFG_NAMCO56XX_ADD("namcoio_2", intf1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( todruaga, mappy )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", phozon_interrupt_1) // also update the custom I/O chips
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", phozon_interrupt_1) // also update the custom I/O chips
- MDRV_DEVICE_REMOVE("namcoio_1")
- MDRV_DEVICE_REMOVE("namcoio_2")
- MDRV_NAMCO58XX_ADD("namcoio_1", intf0)
- MDRV_NAMCO56XX_ADD("namcoio_2", intf1)
+ MCFG_DEVICE_REMOVE("namcoio_1")
+ MCFG_DEVICE_REMOVE("namcoio_2")
+ MCFG_NAMCO58XX_ADD("namcoio_1", intf0)
+ MCFG_NAMCO56XX_ADD("namcoio_2", intf1)
/* video hardware */
- MDRV_GFXDECODE(todruaga)
- MDRV_PALETTE_LENGTH(64*4+64*16)
+ MCFG_GFXDECODE(todruaga)
+ MCFG_PALETTE_LENGTH(64*4+64*16)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( motos, mappy )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", superpac_interrupt_1) // also update the custom I/O chips
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", superpac_interrupt_1) // also update the custom I/O chips
- MDRV_DEVICE_REMOVE("namcoio_1")
- MDRV_DEVICE_REMOVE("namcoio_2")
- MDRV_NAMCO56XX_ADD("namcoio_1", intf0_lamps)
- MDRV_NAMCO56XX_ADD("namcoio_2", intf1)
+ MCFG_DEVICE_REMOVE("namcoio_1")
+ MCFG_DEVICE_REMOVE("namcoio_2")
+ MCFG_NAMCO56XX_ADD("namcoio_1", intf0_lamps)
+ MCFG_NAMCO56XX_ADD("namcoio_2", intf1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index f4af3f80bd7..1cee52b4e80 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -534,33 +534,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( marineb, marineb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(marineb_map)
- MDRV_CPU_IO_MAP(marineb_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(marineb_map)
+ MCFG_CPU_IO_MAP(marineb_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(marineb)
- MDRV_MACHINE_RESET(marineb)
+ MCFG_MACHINE_START(marineb)
+ MCFG_MACHINE_RESET(marineb)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000) /* frames per second, vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000) /* frames per second, vblank duration */)
+ 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)
- MDRV_GFXDECODE(marineb)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(marineb)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(marineb)
- MDRV_VIDEO_START(marineb)
- MDRV_VIDEO_UPDATE(marineb)
+ MCFG_PALETTE_INIT(marineb)
+ MCFG_VIDEO_START(marineb)
+ MCFG_VIDEO_UPDATE(marineb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -569,18 +569,18 @@ static MACHINE_CONFIG_DERIVED( changes, marineb )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(changes)
- MDRV_VIDEO_UPDATE(changes)
+ MCFG_GFXDECODE(changes)
+ MCFG_VIDEO_UPDATE(changes)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( springer, marineb )
/* basic machine hardware */
- MDRV_MACHINE_RESET(springer)
+ MCFG_MACHINE_RESET(springer)
/* video hardware */
- MDRV_VIDEO_UPDATE(springer)
+ MCFG_VIDEO_UPDATE(springer)
MACHINE_CONFIG_END
@@ -589,28 +589,28 @@ static MACHINE_CONFIG_DERIVED( hoccer, marineb )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(hoccer)
- MDRV_VIDEO_UPDATE(hoccer)
+ MCFG_GFXDECODE(hoccer)
+ MCFG_VIDEO_UPDATE(hoccer)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wanted, marineb )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(wanted_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(wanted_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_GFXDECODE(wanted)
- MDRV_VIDEO_UPDATE(springer)
+ MCFG_GFXDECODE(wanted)
+ MCFG_VIDEO_UPDATE(springer)
/* sound hardware */
- MDRV_SOUND_REPLACE("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_REPLACE("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -619,15 +619,15 @@ static MACHINE_CONFIG_DERIVED( hopprobo, marineb )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(hopprobo)
- MDRV_VIDEO_UPDATE(hopprobo)
+ MCFG_GFXDECODE(hopprobo)
+ MCFG_VIDEO_UPDATE(hopprobo)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bcruzm12, wanted )
/* basic machine hardware */
- MDRV_MACHINE_RESET(springer)
+ MCFG_MACHINE_RESET(springer)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index 188a5e7494c..fb8aff813d7 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -646,28 +646,28 @@ static MACHINE_RESET( marinedt )
static MACHINE_CONFIG_START( marinedt, marinedt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,10000000/4)
- MDRV_CPU_PROGRAM_MAP(marinedt_map)
- MDRV_CPU_IO_MAP(marinedt_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,10000000/4)
+ MCFG_CPU_PROGRAM_MAP(marinedt_map)
+ MCFG_CPU_IO_MAP(marinedt_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(marinedt)
- MDRV_MACHINE_RESET(marinedt)
+ MCFG_MACHINE_START(marinedt)
+ MCFG_MACHINE_RESET(marinedt)
/* 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(4*8+32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
-
- MDRV_GFXDECODE(marinedt)
- MDRV_PALETTE_LENGTH(64)
-
- MDRV_PALETTE_INIT(marinedt)
- MDRV_VIDEO_START(marinedt)
- MDRV_VIDEO_UPDATE(marinedt)
+ 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(4*8+32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
+
+ MCFG_GFXDECODE(marinedt)
+ MCFG_PALETTE_LENGTH(64)
+
+ MCFG_PALETTE_INIT(marinedt)
+ MCFG_VIDEO_START(marinedt)
+ MCFG_VIDEO_UPDATE(marinedt)
/* sound hardware */
//discrete sound
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 67752cc80fd..f219cdbcac5 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -320,24 +320,24 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mario_base, mario_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mario_map)
- MDRV_CPU_IO_MAP(mario_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mario_map)
+ MCFG_CPU_IO_MAP(mario_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* devices */
- MDRV_Z80DMA_ADD("z80dma", Z80_CLOCK, mario_dma)
+ MCFG_Z80DMA_ADD("z80dma", Z80_CLOCK, mario_dma)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_GFXDECODE(mario)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_GFXDECODE(mario)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(mario)
- MDRV_VIDEO_START(mario)
- MDRV_VIDEO_UPDATE(mario)
+ MCFG_PALETTE_INIT(mario)
+ MCFG_VIDEO_START(mario)
+ MCFG_VIDEO_UPDATE(mario)
MACHINE_CONFIG_END
@@ -346,7 +346,7 @@ static MACHINE_CONFIG_DERIVED( mario, mario_base )
/* basic machine hardware */
/* sound hardware */
- MDRV_FRAGMENT_ADD(mario_audio)
+ MCFG_FRAGMENT_ADD(mario_audio)
MACHINE_CONFIG_END
@@ -354,12 +354,12 @@ static MACHINE_CONFIG_DERIVED( masao, mario_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(4000000) /* 4.000 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(masao_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(4000000) /* 4.000 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(masao_map)
/* sound hardware */
- MDRV_FRAGMENT_ADD(masao_audio)
+ MCFG_FRAGMENT_ADD(masao_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index 4d1a17d10f7..42a287a5502 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -175,39 +175,39 @@ GFXDECODE_END
static MACHINE_CONFIG_START( markham, markham_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(markham_master_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
+ MCFG_CPU_PROGRAM_MAP(markham_master_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(markham_slave_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
+ MCFG_CPU_PROGRAM_MAP(markham_slave_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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(1*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(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(markham)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(markham)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(markham)
- MDRV_VIDEO_START(markham)
- MDRV_VIDEO_UPDATE(markham)
+ MCFG_PALETTE_INIT(markham)
+ MCFG_VIDEO_START(markham)
+ MCFG_VIDEO_UPDATE(markham)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 8000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("sn1", SN76496, 8000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD("sn2", SN76496, 8000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("sn2", SN76496, 8000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
/****************************************************************************/
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index e615bdf5c7f..8b0af5b1c5d 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -870,37 +870,37 @@ static MACHINE_RESET( mastboy )
static MACHINE_CONFIG_START( mastboy, mastboy_state )
- MDRV_CPU_ADD("maincpu", Z180, 12000000/2) /* HD647180X0CP6-1M1R */
- MDRV_CPU_PROGRAM_MAP(mastboy_map)
- MDRV_CPU_IO_MAP(mastboy_io_map)
- MDRV_CPU_VBLANK_INT("screen", mastboy_interrupt)
+ MCFG_CPU_ADD("maincpu", Z180, 12000000/2) /* HD647180X0CP6-1M1R */
+ MCFG_CPU_PROGRAM_MAP(mastboy_map)
+ MCFG_CPU_IO_MAP(mastboy_io_map)
+ MCFG_CPU_VBLANK_INT("screen", mastboy_interrupt)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_MACHINE_RESET( mastboy )
+ MCFG_MACHINE_RESET( mastboy )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(6000000.0f / 384.0f / 282.0f)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(6000000.0f / 384.0f / 282.0f)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_GFXDECODE(mastboy)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(mastboy)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(mastboy)
- MDRV_VIDEO_UPDATE(mastboy)
+ MCFG_VIDEO_START(mastboy)
+ MCFG_VIDEO_UPDATE(mastboy)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("saa", SAA1099, 6000000 )
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("saa", SAA1099, 6000000 )
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/* Romsets */
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index c2a61ef95a6..b646ca2c5b0 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -311,44 +311,44 @@ static MACHINE_START( matmania )
static MACHINE_CONFIG_START( matmania, matmania_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(matmania_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(matmania_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", M6502, 1200000) /* 1.2 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(matmania_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,15) /* ???? */
+ MCFG_CPU_ADD("audiocpu", M6502, 1200000) /* 1.2 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(matmania_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,15) /* ???? */
/* IRQs are caused by the main CPU */
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(matmania)
+ MCFG_MACHINE_START(matmania)
/* 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(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(matmania)
- MDRV_PALETTE_LENGTH(64+16)
+ MCFG_GFXDECODE(matmania)
+ MCFG_PALETTE_LENGTH(64+16)
- MDRV_PALETTE_INIT(matmania)
- MDRV_VIDEO_START(matmania)
- MDRV_VIDEO_UPDATE(matmania)
+ MCFG_PALETTE_INIT(matmania)
+ MCFG_VIDEO_START(matmania)
+ MCFG_VIDEO_UPDATE(matmania)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -409,46 +409,46 @@ static MACHINE_RESET( maniach )
static MACHINE_CONFIG_START( maniach, matmania_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(maniach_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(maniach_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", M6809, 1500000) /* 1.5 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(maniach_sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, 1500000) /* 1.5 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(maniach_sound_map)
/* IRQs are caused by the main CPU */
- MDRV_CPU_ADD("mcu", M68705, 1500000*2) /* (don't know really how fast, but it doesn't need to even be this fast) */
- MDRV_CPU_PROGRAM_MAP(maniach_mcu_map)
+ MCFG_CPU_ADD("mcu", M68705, 1500000*2) /* (don't know really how fast, but it doesn't need to even be this fast) */
+ MCFG_CPU_PROGRAM_MAP(maniach_mcu_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slice per frame - high interleaving to sync main and mcu */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slice per frame - high interleaving to sync main and mcu */
- MDRV_MACHINE_START(maniach)
- MDRV_MACHINE_RESET(maniach)
+ MCFG_MACHINE_START(maniach)
+ MCFG_MACHINE_RESET(maniach)
/* 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(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(maniach)
- MDRV_PALETTE_LENGTH(64+16)
+ MCFG_GFXDECODE(maniach)
+ MCFG_PALETTE_LENGTH(64+16)
- MDRV_PALETTE_INIT(matmania)
- MDRV_VIDEO_START(matmania)
- MDRV_VIDEO_UPDATE(maniach)
+ MCFG_PALETTE_INIT(matmania)
+ MCFG_VIDEO_START(matmania)
+ MCFG_VIDEO_UPDATE(maniach)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, 3600000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, 3600000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index 34097bebc67..dc5a9a00d9b 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -337,46 +337,46 @@ static const pokey_interface pokey_config = {
static MACHINE_CONFIG_START( a600xl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
- MDRV_CPU_PROGRAM_MAP(a600xl_mem)
- MDRV_CPU_VBLANK_INT_HACK(a800xl_interrupt, TOTAL_LINES_60HZ)
+ MCFG_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
+ MCFG_CPU_PROGRAM_MAP(a600xl_mem)
+ MCFG_CPU_VBLANK_INT_HACK(a800xl_interrupt, TOTAL_LINES_60HZ)
- MDRV_CPU_ADD("mcu", M68705, 3579545)
- MDRV_CPU_PROGRAM_MAP(mcu_mem)
+ MCFG_CPU_ADD("mcu", M68705, 3579545)
+ MCFG_CPU_PROGRAM_MAP(mcu_mem)
- MDRV_PIA6821_ADD("pia", atarixl_pia_interface)
- MDRV_TIMER_ADD("mcu_timer", mcu_timer_proc)
+ MCFG_PIA6821_ADD("pia", atarixl_pia_interface)
+ MCFG_TIMER_ADD("mcu_timer", mcu_timer_proc)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y)
- MDRV_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MDRV_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y)
+ MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
+ MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(atari)
- MDRV_DEFAULT_LAYOUT(layout_maxaflex)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(atari)
+ MCFG_DEFAULT_LAYOUT(layout_maxaflex)
- MDRV_VIDEO_START(atari)
- MDRV_VIDEO_UPDATE(atari)
+ MCFG_VIDEO_START(atari)
+ MCFG_VIDEO_UPDATE(atari)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_MACHINE_START( atarixl )
+ MCFG_MACHINE_START( atarixl )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( maxaflex, a600xl )
- MDRV_MACHINE_RESET( supervisor_board )
+ MCFG_MACHINE_RESET( supervisor_board )
MACHINE_CONFIG_END
ROM_START(maxaflex)
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index b8caa9ef48f..623a799cd22 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -794,27 +794,27 @@ static const duart68681_config maygaym1_duart68681_config =
static MACHINE_CONFIG_START( m1, driver_device )
- MDRV_MACHINE_START(m1)
- MDRV_MACHINE_RESET(m1)
- MDRV_CPU_ADD("maincpu", M6809, M1_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(m1_memmap)
+ MCFG_MACHINE_START(m1)
+ MCFG_MACHINE_RESET(m1)
+ MCFG_CPU_ADD("maincpu", M6809, M1_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(m1_memmap)
- MDRV_DUART68681_ADD("duart68681", M1_DUART_CLOCK, maygaym1_duart68681_config)
- MDRV_PIA6821_ADD("pia", m1_pia_intf)
+ MCFG_DUART68681_ADD("duart68681", M1_DUART_CLOCK, maygaym1_duart68681_config)
+ MCFG_PIA6821_ADD("pia", m1_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd",AY8913, M1_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd",AY8913, M1_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ymsnd", YM2413, M1_MASTER_CLOCK/4)
+ MCFG_SOUND_ADD("ymsnd", YM2413, M1_MASTER_CLOCK/4)
- MDRV_SOUND_ADD("msm6376", OKIM6376, M1_MASTER_CLOCK/4) //?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm6376", OKIM6376, M1_MASTER_CLOCK/4) //?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_DEFAULT_LAYOUT(layout_awpvid16)
MACHINE_CONFIG_END
ROM_START( m_sptlgt )
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index 75103b4e6d4..4f50464ae82 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -991,45 +991,45 @@ static INTERRUPT_GEN( vsync_interrupt )
static MACHINE_CONFIG_START( maygayv1, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", vsync_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", vsync_interrupt)
- MDRV_CPU_ADD("soundcpu", I8052, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_prg)
- MDRV_CPU_DATA_MAP(sound_data)
- MDRV_CPU_IO_MAP(sound_io)
+ MCFG_CPU_ADD("soundcpu", I8052, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_prg)
+ MCFG_CPU_DATA_MAP(sound_data)
+ MCFG_CPU_IO_MAP(sound_io)
- MDRV_PIA6821_ADD("pia", pia_intf)
+ MCFG_PIA6821_ADD("pia", pia_intf)
- MDRV_MACHINE_START(maygayv1)
- MDRV_MACHINE_RESET(maygayv1)
+ MCFG_MACHINE_START(maygayv1)
+ MCFG_MACHINE_RESET(maygayv1)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* TODO: Use real video timings */
- 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, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 300 - 1)
+ 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, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 300 - 1)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_DUART68681_ADD("duart68681", DUART_CLOCK, maygayv1_duart68681_config)
+ MCFG_DUART68681_ADD("duart68681", DUART_CLOCK, maygayv1_duart68681_config)
- MDRV_VIDEO_START(maygayv1)
- MDRV_VIDEO_UPDATE(maygayv1)
- MDRV_VIDEO_EOF(maygayv1)
+ MCFG_VIDEO_START(maygayv1)
+ MCFG_VIDEO_UPDATE(maygayv1)
+ MCFG_VIDEO_EOF(maygayv1)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd",YM2413, MASTER_CLOCK / 4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
+ MCFG_SOUND_ADD("ymsnd",YM2413, MASTER_CLOCK / 4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
- MDRV_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 5d8e4960824..97dd83f1deb 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -370,40 +370,40 @@ static MACHINE_RESET( mayumi )
static MACHINE_CONFIG_START( mayumi, mayumi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 5.000 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mayumi_map)
- MDRV_CPU_IO_MAP(mayumi_io_map)
- MDRV_CPU_VBLANK_INT("screen", mayumi_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 5.000 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(mayumi_map)
+ MCFG_CPU_IO_MAP(mayumi_io_map)
+ MCFG_CPU_VBLANK_INT("screen", mayumi_interrupt)
- MDRV_MACHINE_START( mayumi )
- MDRV_MACHINE_RESET( mayumi )
+ MCFG_MACHINE_START( mayumi )
+ MCFG_MACHINE_RESET( mayumi )
/* 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(2*8, 62*8-1, 2*8, 30*8-1)
+ 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(2*8, 62*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mayumi)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(mayumi)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(mayumi)
- MDRV_VIDEO_UPDATE(mayumi)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(mayumi)
+ MCFG_VIDEO_UPDATE(mayumi)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, MCLK/4)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.40)
+ MCFG_SOUND_ADD("ymsnd", YM2203, MCLK/4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index f989206b6f4..13c84846adc 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1476,41 +1476,41 @@ static MACHINE_RESET( mazerbla )
static MACHINE_CONFIG_START( mazerbla, mazerbla_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
- MDRV_CPU_PROGRAM_MAP(mazerbla_map)
- MDRV_CPU_IO_MAP(mazerbla_io_map)
-
- MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK) /* 4 MHz, NMI, IM1 INT */
- MDRV_CPU_PROGRAM_MAP(mazerbla_cpu2_map)
- MDRV_CPU_IO_MAP(mazerbla_cpu2_io_map)
-// MDRV_CPU_PERIODIC_INT(irq0_line_hold, 400 ) /* frequency in Hz */
-
- MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */
- MDRV_CPU_PROGRAM_MAP(mazerbla_cpu3_map)
- MDRV_CPU_IO_MAP(mazerbla_cpu3_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
+ MCFG_CPU_PROGRAM_MAP(mazerbla_map)
+ MCFG_CPU_IO_MAP(mazerbla_io_map)
+
+ MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK) /* 4 MHz, NMI, IM1 INT */
+ MCFG_CPU_PROGRAM_MAP(mazerbla_cpu2_map)
+ MCFG_CPU_IO_MAP(mazerbla_cpu2_io_map)
+// MCFG_CPU_PERIODIC_INT(irq0_line_hold, 400 ) /* frequency in Hz */
+
+ MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */
+ MCFG_CPU_PROGRAM_MAP(mazerbla_cpu3_map)
+ MCFG_CPU_IO_MAP(mazerbla_cpu3_io_map)
/* (vblank related ??) int generated by a custom video processor
and cleared on ANY port access.
but handled differently for now
*/
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* synchronization forced on the fly */
- MDRV_MACHINE_START(mazerbla)
- MDRV_MACHINE_RESET(mazerbla)
+ MCFG_MACHINE_START(mazerbla)
+ MCFG_MACHINE_RESET(mazerbla)
/* 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(40*8, 32*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(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(mazerbla)
- MDRV_VIDEO_START(mazerbla)
- MDRV_VIDEO_UPDATE(mazerbla)
+ MCFG_PALETTE_INIT(mazerbla)
+ MCFG_VIDEO_START(mazerbla)
+ MCFG_VIDEO_UPDATE(mazerbla)
/* sound hardware */
MACHINE_CONFIG_END
@@ -1519,50 +1519,50 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( greatgun, mazerbla_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
- MDRV_CPU_PROGRAM_MAP(mazerbla_map)
- MDRV_CPU_IO_MAP(greatgun_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
+ MCFG_CPU_PROGRAM_MAP(mazerbla_map)
+ MCFG_CPU_IO_MAP(greatgun_io_map)
- MDRV_CPU_ADD("sub", Z80, SOUND_CLOCK / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */
- MDRV_CPU_PROGRAM_MAP(greatgun_sound_map)
- MDRV_CPU_PERIODIC_INT(sound_interrupt, (double)14318180/16/16/16/16 )
+ MCFG_CPU_ADD("sub", Z80, SOUND_CLOCK / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */
+ MCFG_CPU_PROGRAM_MAP(greatgun_sound_map)
+ MCFG_CPU_PERIODIC_INT(sound_interrupt, (double)14318180/16/16/16/16 )
- MDRV_CPU_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */
- MDRV_CPU_PROGRAM_MAP(mazerbla_cpu3_map)
- MDRV_CPU_IO_MAP(greatgun_cpu3_io_map)
+ MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */
+ MCFG_CPU_PROGRAM_MAP(mazerbla_cpu3_map)
+ MCFG_CPU_IO_MAP(greatgun_cpu3_io_map)
/* (vblank related ??) int generated by a custom video processor
and cleared on ANY port access.
but handled differently for now
*/
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(mazerbla)
- MDRV_MACHINE_RESET(mazerbla)
+ MCFG_MACHINE_START(mazerbla)
+ MCFG_MACHINE_RESET(mazerbla)
/* 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(40*8, 32*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(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(mazerbla)
- MDRV_VIDEO_START(mazerbla)
- MDRV_VIDEO_UPDATE(mazerbla)
+ MCFG_PALETTE_INIT(mazerbla)
+ MCFG_VIDEO_START(mazerbla)
+ MCFG_VIDEO_UPDATE(mazerbla)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, SOUND_CLOCK / 8)
- MDRV_SOUND_CONFIG(ay8912_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, SOUND_CLOCK / 8)
+ MCFG_SOUND_CONFIG(ay8912_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, SOUND_CLOCK / 8)
- MDRV_SOUND_CONFIG(ay8912_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ay2", AY8910, SOUND_CLOCK / 8)
+ MCFG_SOUND_CONFIG(ay8912_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 68d4c6a4ac5..86909afd18d 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -444,49 +444,49 @@ static MACHINE_START( mcatadv )
static MACHINE_CONFIG_START( mcatadv, mcatadv_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mcatadv_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mcatadv_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mcatadv_sound_map)
- MDRV_CPU_IO_MAP(mcatadv_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mcatadv_sound_map)
+ MCFG_CPU_IO_MAP(mcatadv_sound_io_map)
- MDRV_MACHINE_START(mcatadv)
+ MCFG_MACHINE_START(mcatadv)
/* 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(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(mcatadv)
- MDRV_PALETTE_LENGTH(0x2000/2)
+ MCFG_GFXDECODE(mcatadv)
+ MCFG_PALETTE_LENGTH(0x2000/2)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
- MDRV_VIDEO_START(mcatadv)
- MDRV_VIDEO_EOF(mcatadv) // Buffer Spriteram
- MDRV_VIDEO_UPDATE(mcatadv)
+ MCFG_VIDEO_START(mcatadv)
+ MCFG_VIDEO_EOF(mcatadv) // Buffer Spriteram
+ MCFG_VIDEO_UPDATE(mcatadv)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(mcatadv_ym2610_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.32)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.32)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.5)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.5)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(mcatadv_ym2610_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.32)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.32)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.5)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nost, mcatadv )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(nost_sound_map)
- MDRV_CPU_IO_MAP(nost_sound_io_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(nost_sound_map)
+ MCFG_CPU_IO_MAP(nost_sound_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index a3afc45b725..041eadcafbf 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -1570,37 +1570,37 @@ static const samples_interface journey_samples_interface =
static MACHINE_CONFIG_START( mcr_90009, mcr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_OSC_MCR_I/8)
- MDRV_CPU_CONFIG(mcr_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(cpu_90009_map)
- MDRV_CPU_IO_MAP(cpu_90009_portmap)
- MDRV_CPU_VBLANK_INT_HACK(mcr_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC_MCR_I/8)
+ MCFG_CPU_CONFIG(mcr_daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(cpu_90009_map)
+ MCFG_CPU_IO_MAP(cpu_90009_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(mcr_interrupt,2)
- MDRV_Z80CTC_ADD("ctc", MAIN_OSC_MCR_I/8 /* same as "maincpu" */, mcr_ctc_intf)
+ MCFG_Z80CTC_ADD("ctc", MAIN_OSC_MCR_I/8 /* same as "maincpu" */, mcr_ctc_intf)
- MDRV_WATCHDOG_VBLANK_INIT(16)
- MDRV_MACHINE_START(mcr)
- MDRV_MACHINE_RESET(mcr)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_WATCHDOG_VBLANK_INIT(16)
+ MCFG_MACHINE_START(mcr)
+ MCFG_MACHINE_RESET(mcr)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*16, 30*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 0*16, 30*16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*16, 30*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 0*16, 30*16-1)
- MDRV_GFXDECODE(mcr)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(mcr)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_VIDEO_START(mcr)
- MDRV_VIDEO_UPDATE(mcr)
+ MCFG_VIDEO_START(mcr)
+ MCFG_VIDEO_UPDATE(mcr)
/* sound hardware */
- MDRV_FRAGMENT_ADD(mcr_ssio)
+ MCFG_FRAGMENT_ADD(mcr_ssio)
MACHINE_CONFIG_END
@@ -1608,12 +1608,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcr_90010, mcr_90009 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cpu_90010_map)
- MDRV_CPU_IO_MAP(cpu_90010_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cpu_90010_map)
+ MCFG_CPU_IO_MAP(cpu_90010_portmap)
/* video hardware */
- MDRV_PALETTE_LENGTH(64)
+ MCFG_PALETTE_LENGTH(64)
MACHINE_CONFIG_END
@@ -1621,13 +1621,13 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcr_91475, mcr_90010 )
/* video hardware */
- MDRV_PALETTE_LENGTH(128)
+ MCFG_PALETTE_LENGTH(128)
/* sound hardware */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(journey_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(journey_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END
@@ -1635,13 +1635,13 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcr_91490, mcr_90010 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(5000000)
- MDRV_CPU_PROGRAM_MAP(cpu_91490_map)
- MDRV_CPU_IO_MAP(cpu_91490_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(5000000)
+ MCFG_CPU_PROGRAM_MAP(cpu_91490_map)
+ MCFG_CPU_IO_MAP(cpu_91490_portmap)
- MDRV_DEVICE_MODIFY("ctc")
- MDRV_DEVICE_CLOCK(5000000 /* same as "maincpu" */)
+ MCFG_DEVICE_MODIFY("ctc")
+ MCFG_DEVICE_CLOCK(5000000 /* same as "maincpu" */)
MACHINE_CONFIG_END
@@ -1649,7 +1649,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcr_91490_snt, mcr_91490 )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(squawk_n_talk)
+ MCFG_FRAGMENT_ADD(squawk_n_talk)
MACHINE_CONFIG_END
@@ -1657,18 +1657,18 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcr_91490_ipu, mcr_91490_snt )
/* basic machine hardware */
- MDRV_MACHINE_START(nflfoot)
-
- MDRV_CPU_ADD("ipu", Z80, 7372800/2)
- MDRV_CPU_CONFIG(mcr_ipu_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(ipu_91695_map)
- MDRV_CPU_IO_MAP(ipu_91695_portmap)
- MDRV_CPU_VBLANK_INT_HACK(mcr_ipu_interrupt,2)
-
- MDRV_Z80CTC_ADD("ipu_ctc", 7372800/2 /* same as "ipu" */, nflfoot_ctc_intf)
- MDRV_Z80PIO_ADD("ipu_pio0", 7372800/2, nflfoot_pio_intf)
- MDRV_Z80PIO_ADD("ipu_pio1", 7372800/2, nflfoot_pio_intf)
- MDRV_Z80SIO_ADD("ipu_sio", 7372800/2 /* same as "ipu" */, nflfoot_sio_intf)
+ MCFG_MACHINE_START(nflfoot)
+
+ MCFG_CPU_ADD("ipu", Z80, 7372800/2)
+ MCFG_CPU_CONFIG(mcr_ipu_daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(ipu_91695_map)
+ MCFG_CPU_IO_MAP(ipu_91695_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(mcr_ipu_interrupt,2)
+
+ MCFG_Z80CTC_ADD("ipu_ctc", 7372800/2 /* same as "ipu" */, nflfoot_ctc_intf)
+ MCFG_Z80PIO_ADD("ipu_pio0", 7372800/2, nflfoot_pio_intf)
+ MCFG_Z80PIO_ADD("ipu_pio1", 7372800/2, nflfoot_pio_intf)
+ MCFG_Z80SIO_ADD("ipu_sio", 7372800/2 /* same as "ipu" */, nflfoot_sio_intf)
MACHINE_CONFIG_END
@@ -1676,7 +1676,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcr_91490_tcs, mcr_91490 )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(turbo_chip_squeak)
+ MCFG_FRAGMENT_ADD(turbo_chip_squeak)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 8380eb6acf4..57e4fcd0dcd 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -1077,32 +1077,32 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mcr3_base, mcr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_CONFIG(mcr_daisy_chain)
- MDRV_CPU_VBLANK_INT_HACK(mcr_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_CONFIG(mcr_daisy_chain)
+ MCFG_CPU_VBLANK_INT_HACK(mcr_interrupt,2)
- MDRV_Z80CTC_ADD("ctc", MASTER_CLOCK/4 /* same as "maincpu" */, mcr_ctc_intf)
+ MCFG_Z80CTC_ADD("ctc", MASTER_CLOCK/4 /* same as "maincpu" */, mcr_ctc_intf)
- MDRV_WATCHDOG_VBLANK_INIT(16)
- MDRV_MACHINE_START(mcr)
- MDRV_MACHINE_RESET(mcr)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_WATCHDOG_VBLANK_INIT(16)
+ MCFG_MACHINE_START(mcr)
+ MCFG_MACHINE_RESET(mcr)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*16, 30*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 0*16, 30*16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*16, 30*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 0*16, 30*16-1)
- MDRV_GFXDECODE(mcr3)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(mcr3)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_VIDEO_START(mcr)
- MDRV_VIDEO_UPDATE(mcr)
+ MCFG_VIDEO_START(mcr)
+ MCFG_VIDEO_UPDATE(mcr)
MACHINE_CONFIG_END
@@ -1114,13 +1114,13 @@ static MACHINE_CONFIG_DERIVED( mcrmono, mcr3_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mcrmono_map)
- MDRV_CPU_IO_MAP(mcrmono_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mcrmono_map)
+ MCFG_CPU_IO_MAP(mcrmono_portmap)
/* video hardware */
- MDRV_VIDEO_START(mcrmono)
- MDRV_VIDEO_UPDATE(mcr3)
+ MCFG_VIDEO_START(mcrmono)
+ MCFG_VIDEO_UPDATE(mcr3)
MACHINE_CONFIG_END
@@ -1128,7 +1128,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mono_tcs, mcrmono )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(turbo_chip_squeak)
+ MCFG_FRAGMENT_ADD(turbo_chip_squeak)
MACHINE_CONFIG_END
@@ -1136,7 +1136,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mono_sg, mcrmono )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(sounds_good)
+ MCFG_FRAGMENT_ADD(sounds_good)
MACHINE_CONFIG_END
@@ -1147,22 +1147,22 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcrscroll, mcr3_base )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(mcr_ssio)
+ MCFG_FRAGMENT_ADD(mcr_ssio)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spyhunt_map)
- MDRV_CPU_IO_MAP(spyhunt_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spyhunt_map)
+ MCFG_CPU_IO_MAP(spyhunt_portmap)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(30*16, 30*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 30*16-1, 0, 30*16-1)
- MDRV_GFXDECODE(spyhunt)
- MDRV_PALETTE_LENGTH(64+4)
-
- MDRV_PALETTE_INIT(spyhunt)
- MDRV_VIDEO_START(spyhunt)
- MDRV_VIDEO_UPDATE(spyhunt)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(30*16, 30*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 30*16-1, 0, 30*16-1)
+ MCFG_GFXDECODE(spyhunt)
+ MCFG_PALETTE_LENGTH(64+4)
+
+ MCFG_PALETTE_INIT(spyhunt)
+ MCFG_VIDEO_START(spyhunt)
+ MCFG_VIDEO_UPDATE(spyhunt)
MACHINE_CONFIG_END
@@ -1170,7 +1170,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcrsc_csd, mcrscroll )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(chip_squeak_deluxe_stereo)
+ MCFG_FRAGMENT_ADD(chip_squeak_deluxe_stereo)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index 7156029e8a0..85439add60d 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -975,61 +975,61 @@ GFXDECODE_END
static MACHINE_CONFIG_START( zwackery, mcr68_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 7652400) /* should be XTAL_16MHz/2 */
- MDRV_CPU_PROGRAM_MAP(zwackery_map)
- MDRV_CPU_VBLANK_INT("screen", mcr68_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 7652400) /* should be XTAL_16MHz/2 */
+ MCFG_CPU_PROGRAM_MAP(zwackery_map)
+ MCFG_CPU_VBLANK_INT("screen", mcr68_interrupt)
-// MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_MACHINE_START(zwackery)
- MDRV_MACHINE_RESET(zwackery)
+// MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_START(zwackery)
+ MCFG_MACHINE_RESET(zwackery)
- MDRV_PIA6821_ADD("pia0", zwackery_pia0_intf)
- MDRV_PIA6821_ADD("pia1", zwackery_pia1_intf)
- MDRV_PIA6821_ADD("pia2", zwackery_pia2_intf)
+ MCFG_PIA6821_ADD("pia0", zwackery_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", zwackery_pia1_intf)
+ MCFG_PIA6821_ADD("pia2", zwackery_pia2_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*16, 30*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*16-1, 0, 30*16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*16, 30*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*16-1, 0, 30*16-1)
- MDRV_GFXDECODE(zwackery)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(zwackery)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(zwackery)
- MDRV_VIDEO_UPDATE(zwackery)
+ MCFG_VIDEO_START(zwackery)
+ MCFG_VIDEO_UPDATE(zwackery)
/* sound hardware */
- MDRV_FRAGMENT_ADD(chip_squeak_deluxe)
+ MCFG_FRAGMENT_ADD(chip_squeak_deluxe)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mcr68, mcr68_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 7723800)
- MDRV_CPU_PROGRAM_MAP(mcr68_map)
- MDRV_CPU_VBLANK_INT("screen", mcr68_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 7723800)
+ MCFG_CPU_PROGRAM_MAP(mcr68_map)
+ MCFG_CPU_VBLANK_INT("screen", mcr68_interrupt)
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_MACHINE_START(mcr68)
- MDRV_MACHINE_RESET(mcr68)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_START(mcr68)
+ MCFG_MACHINE_RESET(mcr68)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*16, 30*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*16-1, 0, 30*16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*16, 30*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*16-1, 0, 30*16-1)
- MDRV_GFXDECODE(mcr68)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(mcr68)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_VIDEO_START(mcr68)
- MDRV_VIDEO_UPDATE(mcr68)
+ MCFG_VIDEO_START(mcr68)
+ MCFG_VIDEO_UPDATE(mcr68)
/* sound hardware -- determined by specific machine */
MACHINE_CONFIG_END
@@ -1038,53 +1038,53 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( xenophob, mcr68 )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(sounds_good)
+ MCFG_FRAGMENT_ADD(sounds_good)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( intlaser, mcr68 )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(sounds_good)
+ MCFG_FRAGMENT_ADD(sounds_good)
- MDRV_WATCHDOG_VBLANK_INIT(800)
+ MCFG_WATCHDOG_VBLANK_INIT(800)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spyhunt2, mcr68 )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(sounds_good)
- MDRV_DEVICE_REMOVE("mono")
- MDRV_FRAGMENT_ADD(turbo_chip_squeak)
+ MCFG_FRAGMENT_ADD(sounds_good)
+ MCFG_DEVICE_REMOVE("mono")
+ MCFG_FRAGMENT_ADD(turbo_chip_squeak)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( archrivl, mcr68 )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(williams_cvsd_sound)
+ MCFG_FRAGMENT_ADD(williams_cvsd_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pigskin, mcr68 )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(williams_cvsd_sound)
+ MCFG_FRAGMENT_ADD(williams_cvsd_sound)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pigskin_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pigskin_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( trisport, mcr68 )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(williams_cvsd_sound)
+ MCFG_FRAGMENT_ADD(williams_cvsd_sound)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trisport_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(trisport_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index 7e74ceb6d69..54d4c437df3 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -651,63 +651,63 @@ static const samples_interface bowl3d_samples_interface =
static MACHINE_CONFIG_START( meadows, meadows_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MDRV_CPU_PROGRAM_MAP(meadows_main_map)
- MDRV_CPU_VBLANK_INT("screen", meadows_interrupt) /* one interrupt per frame!? */
+ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
+ MCFG_CPU_PROGRAM_MAP(meadows_main_map)
+ MCFG_CPU_VBLANK_INT("screen", meadows_interrupt) /* one interrupt per frame!? */
- MDRV_CPU_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_PERIODIC_INT(audio_interrupt, (double)5000000/131072)
+ MCFG_CPU_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_PERIODIC_INT(audio_interrupt, (double)5000000/131072)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 30*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 30*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(meadows)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(meadows)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(meadows)
- MDRV_VIDEO_START(meadows)
- MDRV_VIDEO_UPDATE(meadows)
+ MCFG_PALETTE_INIT(meadows)
+ MCFG_VIDEO_START(meadows)
+ MCFG_VIDEO_UPDATE(meadows)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(meadows_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(meadows_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( minferno, meadows_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, MASTER_CLOCK/24) /* 5MHz / 8 / 3 = 208.33 kHz */
- MDRV_CPU_PROGRAM_MAP(minferno_main_map)
- MDRV_CPU_IO_MAP(minferno_io_map)
- MDRV_CPU_VBLANK_INT("screen", minferno_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/24) /* 5MHz / 8 / 3 = 208.33 kHz */
+ MCFG_CPU_PROGRAM_MAP(minferno_main_map)
+ MCFG_CPU_IO_MAP(minferno_io_map)
+ MCFG_CPU_VBLANK_INT("screen", minferno_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 24*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 24*8-1)
- MDRV_GFXDECODE(minferno)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(minferno)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(meadows)
- MDRV_VIDEO_START(meadows)
- MDRV_VIDEO_UPDATE(meadows)
+ MCFG_PALETTE_INIT(meadows)
+ MCFG_VIDEO_START(meadows)
+ MCFG_VIDEO_UPDATE(meadows)
/* audio hardware */
MACHINE_CONFIG_END
@@ -715,44 +715,44 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bowl3d, meadows_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MDRV_CPU_PROGRAM_MAP(bowl3d_main_map)
- MDRV_CPU_VBLANK_INT("screen", meadows_interrupt) /* one interrupt per frame!? */
+ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
+ MCFG_CPU_PROGRAM_MAP(bowl3d_main_map)
+ MCFG_CPU_VBLANK_INT("screen", meadows_interrupt) /* one interrupt per frame!? */
- MDRV_CPU_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_PERIODIC_INT(audio_interrupt, (double)5000000/131072)
+ MCFG_CPU_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_PERIODIC_INT(audio_interrupt, (double)5000000/131072)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 30*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 30*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(meadows)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(meadows)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(meadows)
- MDRV_VIDEO_START(meadows)
- MDRV_VIDEO_UPDATE(meadows)
+ MCFG_PALETTE_INIT(meadows)
+ MCFG_VIDEO_START(meadows)
+ MCFG_VIDEO_UPDATE(meadows)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(meadows_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(meadows_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* audio hardware */
- MDRV_SOUND_ADD("samples2", SAMPLES, 0)
- MDRV_SOUND_CONFIG(bowl3d_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(bowl3d_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index b158946ab01..63916d64568 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1101,53 +1101,53 @@ static const struct pit8253_config mediagx_pit8254_config =
static MACHINE_CONFIG_START( mediagx, mediagx_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", MEDIAGX, 166000000)
- MDRV_CPU_PROGRAM_MAP(mediagx_map)
- MDRV_CPU_IO_MAP(mediagx_io)
+ MCFG_CPU_ADD("maincpu", MEDIAGX, 166000000)
+ MCFG_CPU_PROGRAM_MAP(mediagx_map)
+ MCFG_CPU_IO_MAP(mediagx_io)
- MDRV_MACHINE_START(mediagx)
- MDRV_MACHINE_RESET(mediagx)
+ MCFG_MACHINE_START(mediagx)
+ MCFG_MACHINE_RESET(mediagx)
- MDRV_PCI_BUS_ADD("pcibus", 0)
- MDRV_PCI_BUS_DEVICE(18, NULL, cx5510_pci_r, cx5510_pci_w)
+ MCFG_PCI_BUS_ADD("pcibus", 0)
+ MCFG_PCI_BUS_DEVICE(18, NULL, cx5510_pci_r, cx5510_pci_w)
- MDRV_PIT8254_ADD( "pit8254", mediagx_pit8254_config )
+ MCFG_PIT8254_ADD( "pit8254", mediagx_pit8254_config )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
+ MCFG_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
- MDRV_PIC8259_ADD( "pic8259_master", mediagx_pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_master", mediagx_pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_slave", mediagx_pic8259_2_config )
+ MCFG_PIC8259_ADD( "pic8259_slave", mediagx_pic8259_2_config )
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
- MDRV_TIMER_ADD("sound_timer", sound_timer_callback)
+ MCFG_TIMER_ADD("sound_timer", sound_timer_callback)
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239)
- MDRV_GFXDECODE(CGA)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(CGA)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(mediagx)
- MDRV_VIDEO_UPDATE(mediagx)
+ MCFG_VIDEO_START(mediagx)
+ MCFG_VIDEO_UPDATE(mediagx)
/* sound hardware */
- 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)
+ 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)
MACHINE_CONFIG_END
static void set_gate_a20(running_machine *machine, int a20)
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index e79178f02da..69da8046385 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -2456,8 +2456,8 @@ ADDRESS_MAP_END
MACHINE_CONFIG_DERIVED( md_bootleg, megadriv )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(md_bootleg_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(md_bootleg_map)
MACHINE_CONFIG_END
@@ -6359,17 +6359,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_DERIVED( megdsvp, megadriv )
- MDRV_CPU_ADD("svp", SSP1601, MASTER_CLOCK_NTSC / 7 * 3) /* ~23 MHz (guessed) */
- MDRV_CPU_PROGRAM_MAP(svp_ssp_map)
- MDRV_CPU_IO_MAP(svp_ext_map)
+ MCFG_CPU_ADD("svp", SSP1601, MASTER_CLOCK_NTSC / 7 * 3) /* ~23 MHz (guessed) */
+ MCFG_CPU_PROGRAM_MAP(svp_ssp_map)
+ MCFG_CPU_IO_MAP(svp_ext_map)
/* IRQs are not used by this CPU */
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( megdsvppal, megadpal )
- MDRV_CPU_ADD("svp", SSP1601, MASTER_CLOCK_PAL / 7 * 3) /* ~23 MHz (guessed) */
- MDRV_CPU_PROGRAM_MAP(svp_ssp_map)
- MDRV_CPU_IO_MAP(svp_ext_map)
+ MCFG_CPU_ADD("svp", SSP1601, MASTER_CLOCK_PAL / 7 * 3) /* ~23 MHz (guessed) */
+ MCFG_CPU_PROGRAM_MAP(svp_ssp_map)
+ MCFG_CPU_IO_MAP(svp_ext_map)
/* IRQs are not used by this CPU */
MACHINE_CONFIG_END
@@ -8690,104 +8690,104 @@ static NVRAM_HANDLER( megadriv )
MACHINE_CONFIG_FRAGMENT( megadriv_timers )
- MDRV_TIMER_ADD("frame_timer", frame_timer_callback)
- MDRV_TIMER_ADD("scanline_timer", scanline_timer_callback)
- MDRV_TIMER_ADD("render_timer", render_timer_callback)
- MDRV_TIMER_ADD("irq6_timer", irq6_on_callback)
- MDRV_TIMER_ADD("irq4_timer", irq4_on_callback)
+ MCFG_TIMER_ADD("frame_timer", frame_timer_callback)
+ MCFG_TIMER_ADD("scanline_timer", scanline_timer_callback)
+ MCFG_TIMER_ADD("render_timer", render_timer_callback)
+ MCFG_TIMER_ADD("irq6_timer", irq6_on_callback)
+ MCFG_TIMER_ADD("irq4_timer", irq4_on_callback)
MACHINE_CONFIG_END
MACHINE_CONFIG_START( megadriv, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */
- MDRV_CPU_PROGRAM_MAP(megadriv_map)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */
+ MCFG_CPU_PROGRAM_MAP(megadriv_map)
/* IRQs are handled via the timers */
- MDRV_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */
- MDRV_CPU_PROGRAM_MAP(megadriv_z80_map)
- MDRV_CPU_IO_MAP(megadriv_z80_io_map)
+ MCFG_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */
+ MCFG_CPU_PROGRAM_MAP(megadriv_z80_map)
+ MCFG_CPU_IO_MAP(megadriv_z80_io_map)
/* IRQ handled via the timers */
- MDRV_MACHINE_START(megadriv)
- MDRV_MACHINE_RESET(megadriv)
+ MCFG_MACHINE_START(megadriv)
+ MCFG_MACHINE_RESET(megadriv)
- MDRV_FRAGMENT_ADD(megadriv_timers)
+ MCFG_FRAGMENT_ADD(megadriv_timers)
- MDRV_SCREEN_ADD("megadriv", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
+ MCFG_SCREEN_ADD("megadriv", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
#ifndef MESS
- MDRV_NVRAM_HANDLER(megadriv)
+ MCFG_NVRAM_HANDLER(megadriv)
#endif
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(megadriv)
- MDRV_VIDEO_UPDATE(megadriv) /* Copies a bitmap */
- MDRV_VIDEO_EOF(megadriv) /* Used to Sync the timing */
+ MCFG_VIDEO_START(megadriv)
+ MCFG_VIDEO_UPDATE(megadriv) /* Copies a bitmap */
+ MCFG_VIDEO_EOF(megadriv) /* Used to Sync the timing */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
/* sound hardware */
- MDRV_SOUND_ADD("snsnd", SMSIII, MASTER_CLOCK_NTSC/15)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
+ MCFG_SOUND_ADD("snsnd", SMSIII, MASTER_CLOCK_NTSC/15)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
MACHINE_CONFIG_END
/************ PAL hardware has a different master clock *************/
MACHINE_CONFIG_START( megadpal, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */
- MDRV_CPU_PROGRAM_MAP(megadriv_map)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */
+ MCFG_CPU_PROGRAM_MAP(megadriv_map)
/* IRQs are handled via the timers */
- MDRV_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_PAL / 15) /* 3.58 MHz */
- MDRV_CPU_PROGRAM_MAP(megadriv_z80_map)
- MDRV_CPU_IO_MAP(megadriv_z80_io_map)
+ MCFG_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_PAL / 15) /* 3.58 MHz */
+ MCFG_CPU_PROGRAM_MAP(megadriv_z80_map)
+ MCFG_CPU_IO_MAP(megadriv_z80_io_map)
/* IRQ handled via the timers */
- MDRV_MACHINE_START(megadriv)
- MDRV_MACHINE_RESET(megadriv)
+ MCFG_MACHINE_START(megadriv)
+ MCFG_MACHINE_RESET(megadriv)
- MDRV_FRAGMENT_ADD(megadriv_timers)
+ MCFG_FRAGMENT_ADD(megadriv_timers)
- MDRV_SCREEN_ADD("megadriv", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
+ MCFG_SCREEN_ADD("megadriv", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
#ifndef MESS
- MDRV_NVRAM_HANDLER(megadriv)
+ MCFG_NVRAM_HANDLER(megadriv)
#endif
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(megadriv)
- MDRV_VIDEO_UPDATE(megadriv) /* Copies a bitmap */
- MDRV_VIDEO_EOF(megadriv) /* Used to Sync the timing */
+ MCFG_VIDEO_START(megadriv)
+ MCFG_VIDEO_UPDATE(megadriv) /* Copies a bitmap */
+ MCFG_VIDEO_EOF(megadriv) /* Used to Sync the timing */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
/* sound hardware */
- MDRV_SOUND_ADD("snsnd", SMSIII, MASTER_CLOCK_PAL/15)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
+ MCFG_SOUND_ADD("snsnd", SMSIII, MASTER_CLOCK_PAL/15)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
MACHINE_CONFIG_END
@@ -8815,19 +8815,19 @@ static const sh2_cpu_core sh2_conf_slave = { 1, NULL, _32x_fifo_available_callb
MACHINE_CONFIG_DERIVED( genesis_32x, megadriv )
#ifndef _32X_SWAP_MASTER_SLAVE_HACK
- MDRV_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_main_map)
- MDRV_CPU_CONFIG(sh2_conf_master)
+ MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
+ MCFG_CPU_PROGRAM_MAP(sh2_main_map)
+ MCFG_CPU_CONFIG(sh2_conf_master)
#endif
- MDRV_CPU_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_slave_map)
- MDRV_CPU_CONFIG(sh2_conf_slave)
+ MCFG_CPU_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
+ MCFG_CPU_PROGRAM_MAP(sh2_slave_map)
+ MCFG_CPU_CONFIG(sh2_conf_slave)
#ifdef _32X_SWAP_MASTER_SLAVE_HACK
- MDRV_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_main_map)
- MDRV_CPU_CONFIG(sh2_conf_master)
+ MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
+ MCFG_CPU_PROGRAM_MAP(sh2_main_map)
+ MCFG_CPU_CONFIG(sh2_conf_master)
#endif
// brutal needs at least 30000 or the backgrounds don't animate properly / lock up, and the game
@@ -8835,47 +8835,47 @@ MACHINE_CONFIG_DERIVED( genesis_32x, megadriv )
//
// boosting the interleave here actually makes Kolibri run incorrectly however, that
// one works best just boosting the interleave on communications?!
- MDRV_QUANTUM_TIME(HZ(1800000))
+ MCFG_QUANTUM_TIME(HZ(1800000))
// we need to remove and re-add the sound system because the balance is different
// due to MAME / MESS having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is slient?!)
- MDRV_DEVICE_REMOVE("ymsnd")
- MDRV_DEVICE_REMOVE("snsnd")
+ MCFG_DEVICE_REMOVE("ymsnd")
+ MCFG_DEVICE_REMOVE("snsnd")
- MDRV_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7)
- MDRV_SOUND_ROUTE(0, "lspeaker", (0.50)/2)
- MDRV_SOUND_ROUTE(1, "rspeaker", (0.50)/2)
+ MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7)
+ MCFG_SOUND_ROUTE(0, "lspeaker", (0.50)/2)
+ MCFG_SOUND_ROUTE(1, "rspeaker", (0.50)/2)
/* sound hardware */
- MDRV_SOUND_ADD("snsnd", SMSIII, MASTER_CLOCK_NTSC/15)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2)
+ MCFG_SOUND_ADD("snsnd", SMSIII, MASTER_CLOCK_NTSC/15)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2)
- MDRV_SOUND_ADD("lch_pwm", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ADD("lch_pwm", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ADD("rch_pwm", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("rch_pwm", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( genesis_32x_pal, megadpal )
#ifndef _32X_SWAP_MASTER_SLAVE_HACK
- MDRV_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_main_map)
- MDRV_CPU_CONFIG(sh2_conf_master)
+ MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
+ MCFG_CPU_PROGRAM_MAP(sh2_main_map)
+ MCFG_CPU_CONFIG(sh2_conf_master)
#endif
- MDRV_CPU_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_slave_map)
- MDRV_CPU_CONFIG(sh2_conf_slave)
+ MCFG_CPU_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
+ MCFG_CPU_PROGRAM_MAP(sh2_slave_map)
+ MCFG_CPU_CONFIG(sh2_conf_slave)
#ifdef _32X_SWAP_MASTER_SLAVE_HACK
- MDRV_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
- MDRV_CPU_PROGRAM_MAP(sh2_main_map)
- MDRV_CPU_CONFIG(sh2_conf_master)
+ MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
+ MCFG_CPU_PROGRAM_MAP(sh2_main_map)
+ MCFG_CPU_CONFIG(sh2_conf_master)
#endif
// brutal needs at least 30000 or the backgrounds don't animate properly / lock up, and the game
@@ -8883,65 +8883,65 @@ MACHINE_CONFIG_DERIVED( genesis_32x_pal, megadpal )
//
// boosting the interleave here actually makes Kolibri run incorrectly however, that
// one works best just boosting the interleave on communications?!
- MDRV_QUANTUM_TIME(HZ(1800000))
+ MCFG_QUANTUM_TIME(HZ(1800000))
// we need to remove and re-add the sound system because the balance is different
// due to MAME / MESS having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is slient?!)
- MDRV_DEVICE_REMOVE("ymsnd")
- MDRV_DEVICE_REMOVE("snsnd")
+ MCFG_DEVICE_REMOVE("ymsnd")
+ MCFG_DEVICE_REMOVE("snsnd")
- MDRV_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7)
- MDRV_SOUND_ROUTE(0, "lspeaker", (0.50)/2)
- MDRV_SOUND_ROUTE(1, "rspeaker", (0.50)/2)
+ MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7)
+ MCFG_SOUND_ROUTE(0, "lspeaker", (0.50)/2)
+ MCFG_SOUND_ROUTE(1, "rspeaker", (0.50)/2)
/* sound hardware */
- MDRV_SOUND_ADD("snsnd", SMSIII, MASTER_CLOCK_PAL/15)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2)
+ MCFG_SOUND_ADD("snsnd", SMSIII, MASTER_CLOCK_PAL/15)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2)
- MDRV_SOUND_ADD("lch_pwm", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ADD("lch_pwm", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ADD("rch_pwm", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("rch_pwm", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( genesis_scd, megadriv )
- MDRV_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */
- MDRV_CPU_PROGRAM_MAP(segacd_map)
+ MCFG_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(segacd_map)
- MDRV_SOUND_ADD( "cdda", CDDA, 0 )
- MDRV_SOUND_ROUTE( 0, "lspeaker", 1.00 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 1.00 )
+ MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 1.00 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 1.00 )
- MDRV_SOUND_ADD("rfsnd", RF5C68, SEGACD_CLOCK) // RF5C164!
- MDRV_SOUND_ROUTE( 0, "lspeaker", 0.25 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 0.25 )
+ MCFG_SOUND_ADD("rfsnd", RF5C68, SEGACD_CLOCK) // RF5C164!
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 0.25 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 0.25 )
#ifdef MESS
- MDRV_CDROM_ADD( "cdrom" )
+ MCFG_CDROM_ADD( "cdrom" )
#endif
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( genesis_32x_scd, genesis_32x )
- MDRV_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */
- MDRV_CPU_PROGRAM_MAP(segacd_map)
+ MCFG_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(segacd_map)
- MDRV_SOUND_ADD( "cdda", CDDA, 0 )
- MDRV_SOUND_ROUTE( 0, "lspeaker", 1.00 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 1.00 )
+ MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 1.00 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 1.00 )
- MDRV_SOUND_ADD("rfsnd", RF5C68, SEGACD_CLOCK) // RF5C164
- MDRV_SOUND_ROUTE( 0, "lspeaker", 0.25 )
- MDRV_SOUND_ROUTE( 1, "rspeaker", 0.25 )
+ MCFG_SOUND_ADD("rfsnd", RF5C68, SEGACD_CLOCK) // RF5C164
+ MCFG_SOUND_ROUTE( 0, "lspeaker", 0.25 )
+ MCFG_SOUND_ROUTE( 1, "rspeaker", 0.25 )
#ifdef MESS
- MDRV_CDROM_ADD( "cdrom" )
+ MCFG_CDROM_ADD( "cdrom" )
#endif
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 5fdf4dc6ca4..2495d1550e5 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -653,23 +653,23 @@ static MACHINE_CONFIG_DERIVED( mpnew, megadriv )
/* The Megaplay has an extra BIOS cpu which drives an SMS VDP
which includes an SN76496 for sound */
- MDRV_CPU_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
- MDRV_CPU_PROGRAM_MAP(megaplay_bios_map)
- MDRV_CPU_IO_MAP(megaplay_bios_io_map)
- //MDRV_CPU_VBLANK_INT_HACK(megaplay_bios_irq, 262)
+ MCFG_CPU_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(megaplay_bios_map)
+ MCFG_CPU_IO_MAP(megaplay_bios_io_map)
+ //MCFG_CPU_VBLANK_INT_HACK(megaplay_bios_irq, 262)
- MDRV_MACHINE_RESET( mpnew )
- MDRV_VIDEO_EOF( mpnew )
+ MCFG_MACHINE_RESET( mpnew )
+ MCFG_VIDEO_EOF( mpnew )
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
+ MCFG_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
/* New update functions to handle the extra layer */
- MDRV_VIDEO_START(megplay)
- MDRV_VIDEO_UPDATE(megplay)
+ MCFG_VIDEO_START(megplay)
+ MCFG_VIDEO_UPDATE(megplay)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 00d2b1fbd51..68ae2389f04 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -1457,126 +1457,126 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( system_A, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */
- MDRV_CPU_PROGRAM_MAP(megasys1A_map)
- MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A)
+ MCFG_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */
+ MCFG_CPU_PROGRAM_MAP(megasys1A_map)
+ MCFG_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A)
- MDRV_CPU_ADD("soundcpu", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */
- MDRV_CPU_PROGRAM_MAP(megasys1A_sound_map)
+ MCFG_CPU_ADD("soundcpu", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */
+ MCFG_CPU_PROGRAM_MAP(megasys1A_sound_map)
- MDRV_QUANTUM_TIME(HZ(120000))
+ MCFG_QUANTUM_TIME(HZ(120000))
- MDRV_MACHINE_RESET(megasys1)
+ MCFG_MACHINE_RESET(megasys1)
/* 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)
+ 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)
- MDRV_GFXDECODE(ABC)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ABC)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(megasys1)
- MDRV_VIDEO_START(megasys1)
- MDRV_VIDEO_UPDATE(megasys1)
- MDRV_VIDEO_EOF(megasys1)
+ MCFG_PALETTE_INIT(megasys1)
+ MCFG_VIDEO_START(megasys1)
+ MCFG_VIDEO_UPDATE(megasys1)
+ MCFG_VIDEO_EOF(megasys1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki1", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH) /* 4MHz verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_OKIM6295_ADD("oki1", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH) /* 4MHz verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_OKIM6295_ADD("oki2", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH) /* 4MHz verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_OKIM6295_ADD("oki2", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH) /* 4MHz verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system_A_hachoo, system_A )
- MDRV_MACHINE_RESET(megasys1_hachoo)
+ MCFG_MACHINE_RESET(megasys1_hachoo)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system_B, system_A )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(SYS_B_CPU_CLOCK) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(megasys1B_map)
- MDRV_CPU_VBLANK_INT_HACK(interrupt_B,INTERRUPT_NUM_B)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(SYS_B_CPU_CLOCK) /* 8MHz */
+ MCFG_CPU_PROGRAM_MAP(megasys1B_map)
+ MCFG_CPU_VBLANK_INT_HACK(interrupt_B,INTERRUPT_NUM_B)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(megasys1B_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(megasys1B_sound_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( system_Bbl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, SYS_B_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(megasys1B_map)
- MDRV_CPU_VBLANK_INT_HACK(interrupt_B,INTERRUPT_NUM_B)
+ MCFG_CPU_ADD("maincpu", M68000, SYS_B_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(megasys1B_map)
+ MCFG_CPU_VBLANK_INT_HACK(interrupt_B,INTERRUPT_NUM_B)
- MDRV_MACHINE_RESET(megasys1)
+ MCFG_MACHINE_RESET(megasys1)
/* 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)
+ 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)
- MDRV_GFXDECODE(ABC)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ABC)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(megasys1)
- MDRV_VIDEO_START(megasys1)
- MDRV_VIDEO_UPDATE(megasys1)
- MDRV_VIDEO_EOF(megasys1)
+ MCFG_PALETTE_INIT(megasys1)
+ MCFG_VIDEO_START(megasys1)
+ MCFG_VIDEO_UPDATE(megasys1)
+ MCFG_VIDEO_EOF(megasys1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
/* just the one OKI, used for sound and music */
- MDRV_OKIM6295_ADD("oki1", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_OKIM6295_ADD("oki1", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system_B_hayaosi1, system_B )
/* basic machine hardware */
- MDRV_OKIM6295_REPLACE("oki1", 2000000, OKIM6295_PIN7_HIGH) /* correct speed, but unknown OSC + divider combo */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_OKIM6295_REPLACE("oki1", 2000000, OKIM6295_PIN7_HIGH) /* correct speed, but unknown OSC + divider combo */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_OKIM6295_REPLACE("oki2", 2000000, OKIM6295_PIN7_HIGH) /* correct speed, but unknown OSC + divider combo */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_OKIM6295_REPLACE("oki2", 2000000, OKIM6295_PIN7_HIGH) /* correct speed, but unknown OSC + divider combo */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system_C, system_A )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(SYS_C_CPU_CLOCK) /* 12MHz */
- MDRV_CPU_PROGRAM_MAP(megasys1C_map)
- MDRV_CPU_VBLANK_INT_HACK(interrupt_C,INTERRUPT_NUM_C)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(SYS_C_CPU_CLOCK) /* 12MHz */
+ MCFG_CPU_PROGRAM_MAP(megasys1C_map)
+ MCFG_CPU_VBLANK_INT_HACK(interrupt_C,INTERRUPT_NUM_C)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(megasys1B_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(megasys1B_sound_map)
MACHINE_CONFIG_END
@@ -1594,33 +1594,33 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( system_D, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, SYS_D_CPU_CLOCK) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(megasys1D_map)
- MDRV_CPU_VBLANK_INT("screen", interrupt_D)
+ MCFG_CPU_ADD("maincpu", M68000, SYS_D_CPU_CLOCK) /* 8MHz */
+ MCFG_CPU_PROGRAM_MAP(megasys1D_map)
+ MCFG_CPU_VBLANK_INT("screen", interrupt_D)
- MDRV_MACHINE_RESET(megasys1)
+ MCFG_MACHINE_RESET(megasys1)
/* 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)
+ 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)
- MDRV_GFXDECODE(ABC)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ABC)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(megasys1)
- MDRV_VIDEO_START(megasys1)
- MDRV_VIDEO_UPDATE(megasys1)
- MDRV_VIDEO_EOF(megasys1)
+ MCFG_PALETTE_INIT(megasys1)
+ MCFG_VIDEO_START(megasys1)
+ MCFG_VIDEO_UPDATE(megasys1)
+ MCFG_VIDEO_EOF(megasys1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", SYS_D_CPU_CLOCK/4, OKIM6295_PIN7_HIGH) /* 2MHz (8MHz / 4) */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", SYS_D_CPU_CLOCK/4, OKIM6295_PIN7_HIGH) /* 2MHz (8MHz / 4) */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1656,34 +1656,34 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( system_Z, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */
- MDRV_CPU_PROGRAM_MAP(megasys1A_map)
- MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A)
+ MCFG_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */
+ MCFG_CPU_PROGRAM_MAP(megasys1A_map)
+ MCFG_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A)
- MDRV_CPU_ADD("soundcpu", Z80, 3000000) /* OSC 12MHz divided by 4 ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_IO_MAP(z80_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 3000000) /* OSC 12MHz divided by 4 ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_IO_MAP(z80_sound_io_map)
/* 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)
+ 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)
- MDRV_GFXDECODE(Z)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(Z)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(megasys1)
- MDRV_VIDEO_UPDATE(megasys1)
+ MCFG_VIDEO_START(megasys1)
+ MCFG_VIDEO_UPDATE(megasys1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index 96d3f8f09a0..9e75d862730 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -526,28 +526,28 @@ static MACHINE_CONFIG_DERIVED( megatech, megadriv )
/* basic machine hardware */
/* Megatech has an extra SMS based bios *and* an additional screen */
- MDRV_CPU_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
- MDRV_CPU_PROGRAM_MAP(megatech_bios_map)
- MDRV_CPU_IO_MAP(megatech_bios_portmap)
+ MCFG_CPU_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(megatech_bios_map)
+ MCFG_CPU_IO_MAP(megatech_bios_portmap)
- MDRV_MACHINE_RESET(mtnew)
+ MCFG_MACHINE_RESET(mtnew)
- MDRV_VIDEO_START(mtnew)
- MDRV_VIDEO_UPDATE(mtnew)
- MDRV_VIDEO_EOF(mtnew)
+ MCFG_VIDEO_START(mtnew)
+ MCFG_VIDEO_UPDATE(mtnew)
+ MCFG_VIDEO_EOF(mtnew)
- MDRV_DEFAULT_LAYOUT(layout_dualhovu)
+ MCFG_DEFAULT_LAYOUT(layout_dualhovu)
- MDRV_SCREEN_ADD("menu", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(342,262)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
+ MCFG_SCREEN_ADD("menu", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(342,262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
/* sound hardware */
- MDRV_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 40b477a67f5..bbf006cffac 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -247,56 +247,56 @@ static MACHINE_RESET( megazone )
static MACHINE_CONFIG_START( megazone, megazone_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 18432000/9) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(megazone_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, 18432000/9) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(megazone_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,18432000/6) /* Z80 Clock is derived from the H1 signal */
- MDRV_CPU_PROGRAM_MAP(megazone_sound_map)
- MDRV_CPU_IO_MAP(megazone_sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80,18432000/6) /* Z80 Clock is derived from the H1 signal */
+ MCFG_CPU_PROGRAM_MAP(megazone_sound_map)
+ MCFG_CPU_IO_MAP(megazone_sound_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("daccpu", I8039,14318000/2) /* 1/2 14MHz crystal */
- MDRV_CPU_PROGRAM_MAP(megazone_i8039_map)
- MDRV_CPU_IO_MAP(megazone_i8039_io_map)
+ MCFG_CPU_ADD("daccpu", I8039,14318000/2) /* 1/2 14MHz crystal */
+ MCFG_CPU_PROGRAM_MAP(megazone_i8039_map)
+ MCFG_CPU_IO_MAP(megazone_i8039_io_map)
- MDRV_QUANTUM_TIME(HZ(900))
- MDRV_MACHINE_START(megazone)
- MDRV_MACHINE_RESET(megazone)
+ MCFG_QUANTUM_TIME(HZ(900))
+ MCFG_MACHINE_START(megazone)
+ MCFG_MACHINE_RESET(megazone)
/* 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(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*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(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(megazone)
- MDRV_PALETTE_LENGTH(16*16+16*16)
+ MCFG_GFXDECODE(megazone)
+ MCFG_PALETTE_LENGTH(16*16+16*16)
- MDRV_PALETTE_INIT(megazone)
- MDRV_VIDEO_START(megazone)
- MDRV_VIDEO_UPDATE(megazone)
+ MCFG_PALETTE_INIT(megazone)
+ MCFG_VIDEO_START(megazone)
+ MCFG_VIDEO_UPDATE(megazone)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(0, "filter.0.0", 0.30)
- MDRV_SOUND_ROUTE(1, "filter.0.1", 0.30)
- MDRV_SOUND_ROUTE(2, "filter.0.2", 0.30)
-
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- 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)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("aysnd", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(0, "filter.0.0", 0.30)
+ MCFG_SOUND_ROUTE(1, "filter.0.1", 0.30)
+ MCFG_SOUND_ROUTE(2, "filter.0.2", 0.30)
+
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ 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)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index d7d693bde5e..3759356a41f 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -340,38 +340,38 @@ static MACHINE_RESET( meijinsn )
static MACHINE_CONFIG_START( meijinsn, meijinsn_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 9000000 )
- MDRV_CPU_PROGRAM_MAP(meijinsn_map)
- MDRV_CPU_VBLANK_INT_HACK(meijinsn_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 9000000 )
+ MCFG_CPU_PROGRAM_MAP(meijinsn_map)
+ MCFG_CPU_VBLANK_INT_HACK(meijinsn_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(meijinsn_sound_map)
- MDRV_CPU_IO_MAP(meijinsn_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 160)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(meijinsn_sound_map)
+ MCFG_CPU_IO_MAP(meijinsn_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 160)
- MDRV_MACHINE_START(meijinsn)
- MDRV_MACHINE_RESET(meijinsn)
+ MCFG_MACHINE_START(meijinsn)
+ MCFG_MACHINE_RESET(meijinsn)
/* 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(12, 243, 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(12, 243, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(meijinsn)
+ MCFG_PALETTE_LENGTH(32)
+ MCFG_PALETTE_INIT(meijinsn)
- MDRV_VIDEO_START(meijinsn)
- MDRV_VIDEO_UPDATE(meijinsn)
+ MCFG_VIDEO_START(meijinsn)
+ MCFG_VIDEO_UPDATE(meijinsn)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 52d95f5273a..0a04130c334 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -1219,104 +1219,104 @@ static MACHINE_START(casino5)
}
static MACHINE_CONFIG_START( pitboss, merit_state )
- MDRV_CPU_ADD("maincpu",Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(pitboss_map)
- MDRV_CPU_IO_MAP(trvwhiz_io_map)
+ MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(pitboss_map)
+ MCFG_CPU_IO_MAP(trvwhiz_io_map)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- MDRV_MACHINE_START(merit)
+ MCFG_MACHINE_START(merit)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 512, 0, 512, 256, 0, 256) /* temporary, CRTC will configure screen */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 512, 0, 512, 256, 0, 256) /* temporary, CRTC will configure screen */
- MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
- MDRV_VIDEO_UPDATE(merit)
+ MCFG_VIDEO_UPDATE(merit)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, CRTC_CLOCK)
- MDRV_SOUND_CONFIG(merit_ay8912_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("aysnd", AY8910, CRTC_CLOCK)
+ MCFG_SOUND_CONFIG(merit_ay8912_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( casino5, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(casino5_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(casino5_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(casino5)
+ MCFG_MACHINE_START(casino5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bigappg, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bigappg_map)
- MDRV_CPU_IO_MAP(tictac_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bigappg_map)
+ MCFG_CPU_IO_MAP(tictac_io_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dodge, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dodge_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dodge_map)
- MDRV_NVRAM_REPLACE_CUSTOM("nvram", merit_state, dodge_nvram_init)
+ MCFG_NVRAM_REPLACE_CUSTOM("nvram", merit_state, dodge_nvram_init)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tictac, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tictac_map)
- MDRV_CPU_IO_MAP(tictac_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tictac_map)
+ MCFG_CPU_IO_MAP(tictac_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( trvwhiz, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trvwhiz_map)
- MDRV_CPU_IO_MAP(trvwhiz_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(trvwhiz_map)
+ MCFG_CPU_IO_MAP(trvwhiz_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dtrvwz5, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dtrvwz5_map)
- MDRV_CPU_IO_MAP(tictac_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dtrvwz5_map)
+ MCFG_CPU_IO_MAP(tictac_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( phrcraze, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(phrcraze_map)
- MDRV_CPU_IO_MAP(phrcraze_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(phrcraze_map)
+ MCFG_CPU_IO_MAP(phrcraze_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( trvwhziv, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trvwhziv_map)
- MDRV_CPU_IO_MAP(tictac_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(trvwhziv_map)
+ MCFG_CPU_IO_MAP(tictac_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( couple, pitboss )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(couple_map)
- MDRV_CPU_IO_MAP(tictac_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(couple_map)
+ MCFG_CPU_IO_MAP(tictac_io_map)
- MDRV_DEVICE_MODIFY("ppi8255_0")
- MDRV_DEVICE_CONFIG( ppi8255_couple_intf[0])
- MDRV_DEVICE_MODIFY("ppi8255_1")
- MDRV_DEVICE_CONFIG( ppi8255_couple_intf[1])
+ MCFG_DEVICE_MODIFY("ppi8255_0")
+ MCFG_DEVICE_CONFIG( ppi8255_couple_intf[0])
+ MCFG_DEVICE_MODIFY("ppi8255_1")
+ MCFG_DEVICE_CONFIG( ppi8255_couple_intf[1])
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index 0d4c661e02e..1d8a28e73f7 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -1038,68 +1038,68 @@ static TIMER_DEVICE_CALLBACK( vblank_end_tick )
}
static MACHINE_CONFIG_START( meritm_crt250, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6)
- MDRV_CPU_PROGRAM_MAP(meritm_crt250_map)
- MDRV_CPU_IO_MAP(meritm_crt250_io_map)
- MDRV_CPU_CONFIG(meritm_daisy_chain)
- MDRV_CPU_VBLANK_INT_HACK(meritm_interrupt,262)
+ MCFG_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6)
+ MCFG_CPU_PROGRAM_MAP(meritm_crt250_map)
+ MCFG_CPU_IO_MAP(meritm_crt250_io_map)
+ MCFG_CPU_CONFIG(meritm_daisy_chain)
+ MCFG_CPU_VBLANK_INT_HACK(meritm_interrupt,262)
- MDRV_MACHINE_START(meritm_crt250)
+ MCFG_MACHINE_START(meritm_crt250)
- MDRV_PPI8255_ADD( "ppi8255", crt250_ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", crt250_ppi8255_intf )
- MDRV_Z80PIO_ADD( "z80pio_0", SYSTEM_CLK/6, meritm_audio_pio_intf )
- MDRV_Z80PIO_ADD( "z80pio_1", SYSTEM_CLK/6, meritm_io_pio_intf )
+ MCFG_Z80PIO_ADD( "z80pio_0", SYSTEM_CLK/6, meritm_audio_pio_intf )
+ MCFG_Z80PIO_ADD( "z80pio_1", SYSTEM_CLK/6, meritm_io_pio_intf )
- MDRV_TIMER_ADD_SCANLINE("vblank_start", vblank_start_tick, "screen", 259, 262)
- MDRV_TIMER_ADD_SCANLINE("vblank_end", vblank_end_tick, "screen", 262, 262)
+ MCFG_TIMER_ADD_SCANLINE("vblank_start", vblank_start_tick, "screen", 259, 262)
+ MCFG_TIMER_ADD_SCANLINE("vblank_end", vblank_end_tick, "screen", 262, 262)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen",RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_ADD("screen",RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS)
- MDRV_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS)
+ MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT( v9938 )
+ MCFG_PALETTE_INIT( v9938 )
- MDRV_VIDEO_START(meritm)
- MDRV_VIDEO_UPDATE(meritm)
+ MCFG_VIDEO_START(meritm)
+ MCFG_VIDEO_UPDATE(meritm)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, SYSTEM_CLK/12)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, SYSTEM_CLK/12)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( meritm_crt250_questions, meritm_crt250 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(meritm_crt250_questions_map)
- MDRV_MACHINE_START(meritm_crt250_questions)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(meritm_crt250_questions_map)
+ MCFG_MACHINE_START(meritm_crt250_questions)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( meritm_crt250_crt252_crt258, meritm_crt250_questions )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(meritm_crt250_crt258_io_map)
- MDRV_MACHINE_START(meritm_crt250_crt252_crt258)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(meritm_crt250_crt258_io_map)
+ MCFG_MACHINE_START(meritm_crt250_crt252_crt258)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( meritm_crt260, meritm_crt250 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(meritm_map)
- MDRV_CPU_IO_MAP(meritm_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(meritm_map)
+ MCFG_CPU_IO_MAP(meritm_io_map)
- MDRV_PPI8255_RECONFIG( "ppi8255", crt260_ppi8255_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255", crt260_ppi8255_intf )
- MDRV_WATCHDOG_TIME_INIT(MSEC(1200)) // DS1232, TD connected to VCC
- MDRV_MACHINE_START(meritm_crt260)
+ MCFG_WATCHDOG_TIME_INIT(MSEC(1200)) // DS1232, TD connected to VCC
+ MCFG_MACHINE_START(meritm_crt260)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index 4ee47a5d271..6fc4379ab2d 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -442,48 +442,48 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( mermaid, mermaid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) // ???
- MDRV_CPU_PROGRAM_MAP(mermaid_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) // ???
+ MCFG_CPU_PROGRAM_MAP(mermaid_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(mermaid)
- MDRV_MACHINE_RESET(mermaid)
+ MCFG_MACHINE_START(mermaid)
+ MCFG_MACHINE_RESET(mermaid)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mermaid)
- MDRV_PALETTE_LENGTH(4*16+2*2)
+ MCFG_GFXDECODE(mermaid)
+ MCFG_PALETTE_LENGTH(4*16+2*2)
- MDRV_PALETTE_INIT(mermaid)
- MDRV_VIDEO_START(mermaid)
- MDRV_VIDEO_UPDATE(mermaid)
- MDRV_VIDEO_EOF(mermaid)
+ MCFG_PALETTE_INIT(mermaid)
+ MCFG_VIDEO_START(mermaid)
+ MCFG_VIDEO_UPDATE(mermaid)
+ MCFG_VIDEO_EOF(mermaid)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rougien, mermaid )
- MDRV_DEVICE_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rougien_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rougien_map)
- MDRV_SOUND_ADD("adpcm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("adpcm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c
index c5f83b31b6c..ca638009015 100644
--- a/src/mame/drivers/metalmx.c
+++ b/src/mame/drivers/metalmx.c
@@ -741,42 +741,42 @@ static const dsp32_config dsp32c_config =
static MACHINE_CONFIG_START( metalmx, metalmx_state )
- MDRV_CPU_ADD("maincpu", M68EC020, XTAL_14_31818MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_14_31818MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("adsp", ADSP2105, XTAL_10MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(adsp_program_map)
- MDRV_CPU_DATA_MAP(adsp_data_map)
+ MCFG_CPU_ADD("adsp", ADSP2105, XTAL_10MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(adsp_program_map)
+ MCFG_CPU_DATA_MAP(adsp_data_map)
- MDRV_CPU_ADD("gsp", TMS34020, 40000000) /* Unverified */
- MDRV_CPU_CONFIG(gsp_config)
- MDRV_CPU_PROGRAM_MAP(gsp_map)
+ MCFG_CPU_ADD("gsp", TMS34020, 40000000) /* Unverified */
+ MCFG_CPU_CONFIG(gsp_config)
+ MCFG_CPU_PROGRAM_MAP(gsp_map)
- MDRV_CPU_ADD("dsp32c_1", DSP32C, 40000000) /* Unverified */
- MDRV_CPU_CONFIG(dsp32c_config)
- MDRV_CPU_PROGRAM_MAP(dsp32c_1_map)
+ MCFG_CPU_ADD("dsp32c_1", DSP32C, 40000000) /* Unverified */
+ MCFG_CPU_CONFIG(dsp32c_config)
+ MCFG_CPU_PROGRAM_MAP(dsp32c_1_map)
- MDRV_CPU_ADD("dsp32c_2", DSP32C, 40000000) /* Unverified */
- MDRV_CPU_CONFIG(dsp32c_config)
- MDRV_CPU_PROGRAM_MAP(dsp32c_2_map)
+ MCFG_CPU_ADD("dsp32c_2", DSP32C, 40000000) /* Unverified */
+ MCFG_CPU_CONFIG(dsp32c_config)
+ MCFG_CPU_PROGRAM_MAP(dsp32c_2_map)
- MDRV_MACHINE_RESET(metalmx)
+ MCFG_MACHINE_RESET(metalmx)
- 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, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ 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, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
- MDRV_PALETTE_LENGTH(65536)
- MDRV_PALETTE_INIT(RRRRR_GGGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_INIT(RRRRR_GGGGGG_BBBBB)
- MDRV_VIDEO_START(metalmx)
- MDRV_VIDEO_UPDATE(metalmx)
+ MCFG_VIDEO_START(metalmx)
+ MCFG_VIDEO_UPDATE(metalmx)
- MDRV_FRAGMENT_ADD(cage)
+ MCFG_FRAGMENT_ADD(cage)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 576fa9ad1bd..adba5f45e32 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -297,44 +297,44 @@ static MACHINE_RESET( metlclsh )
static MACHINE_CONFIG_START( metlclsh, metlclsh_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 1500000) // ?
- MDRV_CPU_PROGRAM_MAP(metlclsh_master_map)
+ MCFG_CPU_ADD("maincpu", M6809, 1500000) // ?
+ MCFG_CPU_PROGRAM_MAP(metlclsh_master_map)
// IRQ by YM3526, NMI by cpu #2
- MDRV_CPU_ADD("sub", M6809, 1500000) // ?
- MDRV_CPU_PROGRAM_MAP(metlclsh_slave_map)
- MDRV_CPU_VBLANK_INT_HACK(metlclsh_interrupt2,2)
+ MCFG_CPU_ADD("sub", M6809, 1500000) // ?
+ MCFG_CPU_PROGRAM_MAP(metlclsh_slave_map)
+ MCFG_CPU_VBLANK_INT_HACK(metlclsh_interrupt2,2)
// IRQ by cpu #1, NMI by coins insertion
- MDRV_MACHINE_START(metlclsh)
- MDRV_MACHINE_RESET(metlclsh)
+ MCFG_MACHINE_START(metlclsh)
+ MCFG_MACHINE_RESET(metlclsh)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 30*8-1)
- MDRV_GFXDECODE(metlclsh)
- MDRV_PALETTE_LENGTH(3 * 16)
+ MCFG_GFXDECODE(metlclsh)
+ MCFG_PALETTE_LENGTH(3 * 16)
- MDRV_VIDEO_START(metlclsh)
- MDRV_VIDEO_UPDATE(metlclsh)
+ MCFG_VIDEO_START(metlclsh)
+ MCFG_VIDEO_UPDATE(metlclsh)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD("ym2", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index b80f2c3bbb9..0cd0c497db3 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -3612,818 +3612,818 @@ static const UPD7810_CONFIG metro_cpu_config =
static MACHINE_CONFIG_START( balcube, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(balcube_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(balcube_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14220)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14220)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( daitoa, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(daitoa_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(daitoa_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14220)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14220)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( msgogo, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(msgogo_map)
- MDRV_CPU_VBLANK_INT_HACK(msgogo_interrupt,262) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(msgogo_map)
+ MCFG_CPU_VBLANK_INT_HACK(msgogo_interrupt,262) /* ? */
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14220)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14220)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bangball, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(bangball_map)
- MDRV_CPU_VBLANK_INT("screen", bangball_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(bangball_map)
+ MCFG_CPU_VBLANK_INT("screen", bangball_interrupt)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14220)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14220)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( batlbubl, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(batlbubl_map)
- MDRV_CPU_VBLANK_INT("screen", bangball_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(batlbubl_map)
+ MCFG_CPU_VBLANK_INT("screen", bangball_interrupt)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14220)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14220)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( daitorid, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(daitorid_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(daitorid_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(daitorid_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(daitorid_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14220)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14220)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dharma, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(dharma_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(dharma_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( karatour, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(karatour_map)
- MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(karatour_map)
+ MCFG_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( 3kokushi, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(kokushi_map)
- MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(kokushi_map)
+ MCFG_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(14220)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14220)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14220)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14220)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( lastfort, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(lastfort_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(lastfort_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(360, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(360, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( lastforg, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(lastforg_map)
- MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(lastforg_map)
+ MCFG_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(360, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-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(360, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dokyusei, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(dokyusei_map)
- MDRV_CPU_VBLANK_INT_HACK(dokyusei_interrupt,2) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(dokyusei_map)
+ MCFG_CPU_VBLANK_INT_HACK(dokyusei_interrupt,2) /* ? */
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 256-32)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-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(320, 256-32)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
- MDRV_GFXDECODE(14300)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14300)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14300)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14300)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, 8000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 8000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dokyusp, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(dokyusp_map)
- MDRV_CPU_VBLANK_INT("screen", gakusai_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(dokyusp_map)
+ MCFG_CPU_VBLANK_INT("screen", gakusai_interrupt)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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(384, 256-32)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 256-32-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(384, 256-32)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 256-32-1)
- MDRV_GFXDECODE(14300)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14300)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14300)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14300)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, 8000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 8000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gakusai, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(gakusai_map)
- MDRV_CPU_VBLANK_INT("screen", gakusai_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(gakusai_map)
+ MCFG_CPU_VBLANK_INT("screen", gakusai_interrupt)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(14300)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14300)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14300)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14300)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, 8000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 8000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gakusai2, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(gakusai2_map)
- MDRV_CPU_VBLANK_INT("screen", gakusai_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(gakusai2_map)
+ MCFG_CPU_VBLANK_INT("screen", gakusai_interrupt)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_GFXDECODE(14300)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14300)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14300)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14300)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, 8000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 8000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pangpoms, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(pangpoms_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(pangpoms_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(360, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-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(360, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( poitto, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(poitto_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(poitto_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(360, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-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(360, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pururun, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(pururun_map)
- //MDRV_CPU_VBLANK_INT_HACK(msgogo_interrupt,262) /* fixes the title screen scroll in GunMaster, but makes the game painfully slow */
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(pururun_map)
+ //MCFG_CPU_VBLANK_INT_HACK(msgogo_interrupt,262) /* fixes the title screen scroll in GunMaster, but makes the game painfully slow */
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(daitorid_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(daitorid_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( skyalert, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(skyalert_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(skyalert_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(360, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-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(360, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 360-1, 0, 224-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( toride2g, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(toride2g_map)
- MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(toride2g_map)
+ MCFG_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", UPD7810, 12000000)
- MDRV_CPU_CONFIG(metro_cpu_config)
- MDRV_CPU_PROGRAM_MAP(metro_sound_map)
- MDRV_CPU_IO_MAP(metro_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_CPU_CONFIG(metro_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(metro_sound_map)
+ MCFG_CPU_IO_MAP(metro_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14100)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14100)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14100)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14100)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mouja, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mouja_map)
- MDRV_CPU_VBLANK_INT("screen", mouja_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(mouja_map)
+ MCFG_CPU_VBLANK_INT("screen", mouja_interrupt)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(14300)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14300)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14300)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14300)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 16000000/1024*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
-
- MDRV_SOUND_ADD("ymsnd", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_OKIM6295_ADD("oki", 16000000/1024*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
+
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
MACHINE_CONFIG_END
@@ -4435,42 +4435,42 @@ static const k053936_interface blzntrnd_k053936_intf =
static MACHINE_CONFIG_START( blzntrnd, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(blzntrnd_map)
- MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(blzntrnd_map)
+ MCFG_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(blzntrnd_sound_map)
- MDRV_CPU_IO_MAP(blzntrnd_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(blzntrnd_sound_map)
+ MCFG_CPU_IO_MAP(blzntrnd_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(8, 320-8-1, 0, 224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(8, 320-8-1, 0, 224-1)
- MDRV_GFXDECODE(blzntrnd)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(blzntrnd)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(blzntrnd)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(blzntrnd)
+ MCFG_VIDEO_UPDATE(metro)
- MDRV_K053936_ADD("k053936", blzntrnd_k053936_intf)
+ MCFG_K053936_ADD("k053936", blzntrnd_k053936_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(blzntrnd_ym2610_interface)
- 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(blzntrnd_ym2610_interface)
+ 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
/* like blzntrnd but new vidstart / gfxdecode for the different bg tilemap */
@@ -4483,42 +4483,42 @@ static const k053936_interface gstrik2_k053936_intf =
static MACHINE_CONFIG_START( gstrik2, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(blzntrnd_map)
- MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(blzntrnd_map)
+ MCFG_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
- MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(blzntrnd_sound_map)
- MDRV_CPU_IO_MAP(blzntrnd_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(blzntrnd_sound_map)
+ MCFG_CPU_IO_MAP(blzntrnd_sound_io_map)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(8, 320-8-1, 0, 224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(8, 320-8-1, 0, 224-1)
- MDRV_GFXDECODE(gstrik2)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(gstrik2)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(gstrik2)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(gstrik2)
+ MCFG_VIDEO_UPDATE(metro)
- MDRV_K053936_ADD("k053936", gstrik2_k053936_intf)
+ MCFG_K053936_ADD("k053936", gstrik2_k053936_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(blzntrnd_ym2610_interface)
- 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(blzntrnd_ym2610_interface)
+ 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
@@ -4558,38 +4558,38 @@ static INTERRUPT_GEN( puzzlet_interrupt )
static MACHINE_CONFIG_START( puzzlet, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
- MDRV_CPU_PROGRAM_MAP(puzzlet_map)
- MDRV_CPU_IO_MAP(puzzlet_io_map)
- MDRV_CPU_VBLANK_INT_HACK(puzzlet_interrupt, 5)
+ MCFG_CPU_ADD("maincpu", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
+ MCFG_CPU_PROGRAM_MAP(puzzlet_map)
+ MCFG_CPU_IO_MAP(puzzlet_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(puzzlet_interrupt, 5)
- MDRV_MACHINE_START(metro)
- MDRV_MACHINE_RESET(metro)
+ MCFG_MACHINE_START(metro)
+ MCFG_MACHINE_RESET(metro)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256-32)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256-32)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
- MDRV_GFXDECODE(14300)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(14300)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(metro_14300)
- MDRV_VIDEO_UPDATE(metro)
+ MCFG_VIDEO_START(metro_14300)
+ MCFG_VIDEO_UPDATE(metro)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", XTAL_20MHz/5, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz/5, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_20MHz/5)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_20MHz/5)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.90)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index 7ff23fd7f96..8513426e2a3 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -474,49 +474,49 @@ static MACHINE_RESET( mexico86 )
static MACHINE_CONFIG_START( mexico86, mexico86_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
- MDRV_CPU_PROGRAM_MAP(mexico86_map)
+ MCFG_CPU_ADD("maincpu",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
+ MCFG_CPU_PROGRAM_MAP(mexico86_map)
- MDRV_CPU_ADD("audiocpu", Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
- MDRV_CPU_PROGRAM_MAP(mexico86_sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
+ MCFG_CPU_PROGRAM_MAP(mexico86_sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mcu", M68705, 4000000) /* xtal is 4MHz, divided by 4 internally */
- MDRV_CPU_PROGRAM_MAP(mexico86_m68705_map)
- MDRV_CPU_VBLANK_INT_HACK(mexico86_m68705_interrupt,2)
+ MCFG_CPU_ADD("mcu", M68705, 4000000) /* xtal is 4MHz, divided by 4 internally */
+ MCFG_CPU_PROGRAM_MAP(mexico86_m68705_map)
+ MCFG_CPU_VBLANK_INT_HACK(mexico86_m68705_interrupt,2)
- MDRV_CPU_ADD("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */
- MDRV_CPU_PROGRAM_MAP(mexico86_sub_cpu_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */
+ MCFG_CPU_PROGRAM_MAP(mexico86_sub_cpu_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs */
- MDRV_MACHINE_START(mexico86)
- MDRV_MACHINE_RESET(mexico86)
+ MCFG_MACHINE_START(mexico86)
+ MCFG_MACHINE_RESET(mexico86)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
+ 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)
- MDRV_GFXDECODE(mexico86)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(mexico86)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_UPDATE(mexico86)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_UPDATE(mexico86)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ROUTE(2, "mono", 0.30)
- MDRV_SOUND_ROUTE(3, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ROUTE(2, "mono", 0.30)
+ MCFG_SOUND_ROUTE(3, "mono", 1.00)
MACHINE_CONFIG_END
@@ -524,10 +524,10 @@ static MACHINE_CONFIG_DERIVED( knightb, mexico86 )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("sub")
+ MCFG_DEVICE_REMOVE("sub")
/* video hardware */
- MDRV_VIDEO_UPDATE(kikikai)
+ MCFG_VIDEO_UPDATE(kikikai)
MACHINE_CONFIG_END
@@ -535,13 +535,13 @@ static MACHINE_CONFIG_DERIVED( kikikai, knightb )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", kikikai_interrupt) // IRQs should be triggered by the MCU, but we don't have it
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", kikikai_interrupt) // IRQs should be triggered by the MCU, but we don't have it
- MDRV_DEVICE_REMOVE("mcu") // we don't have code for the MC6801U4
+ MCFG_DEVICE_REMOVE("mcu") // we don't have code for the MC6801U4
/* video hardware */
- MDRV_VIDEO_UPDATE(kikikai)
+ MCFG_VIDEO_UPDATE(kikikai)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index c0b5ba75b31..56ea73f713b 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -322,25 +322,25 @@ static MACHINE_RESET( mgolf )
static MACHINE_CONFIG_START( mgolf, mgolf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16) /* ? */
- MDRV_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16) /* ? */
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
- MDRV_MACHINE_START(mgolf)
- MDRV_MACHINE_RESET(mgolf)
+ MCFG_MACHINE_START(mgolf)
+ MCFG_MACHINE_RESET(mgolf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 223)
-
- MDRV_GFXDECODE(mgolf)
- MDRV_PALETTE_LENGTH(4)
-
- MDRV_PALETTE_INIT(mgolf)
- MDRV_VIDEO_START(mgolf)
- MDRV_VIDEO_UPDATE(mgolf)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 223)
+
+ MCFG_GFXDECODE(mgolf)
+ MCFG_PALETTE_LENGTH(4)
+
+ MCFG_PALETTE_INIT(mgolf)
+ MCFG_VIDEO_START(mgolf)
+ MCFG_VIDEO_UPDATE(mgolf)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index cb767d18d0f..490b2353138 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -475,71 +475,71 @@ static const pokey_interface pokey_config =
static MACHINE_CONFIG_START( mhavoc, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(alpha_map)
+ MCFG_CPU_ADD("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(alpha_map)
- MDRV_CPU_ADD("gamma", M6502, MHAVOC_CLOCK_1_25M) /* 1.25 MHz */
- MDRV_CPU_PROGRAM_MAP(gamma_map)
+ MCFG_CPU_ADD("gamma", M6502, MHAVOC_CLOCK_1_25M) /* 1.25 MHz */
+ MCFG_CPU_PROGRAM_MAP(gamma_map)
- MDRV_MACHINE_START(mhavoc)
- MDRV_MACHINE_RESET(mhavoc)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(mhavoc)
+ MCFG_MACHINE_RESET(mhavoc)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_TIMER_ADD_PERIODIC("5k_timer", mhavoc_cpu_irq_clock, HZ(MHAVOC_CLOCK_5K))
+ MCFG_TIMER_ADD_PERIODIC("5k_timer", mhavoc_cpu_irq_clock, HZ(MHAVOC_CLOCK_5K))
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 300, 0, 260)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 300, 0, 260)
- MDRV_VIDEO_START(avg_mhavoc)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(avg_mhavoc)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MHAVOC_CLOCK_1_25M)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("pokey1", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("pokey2", POKEY, MHAVOC_CLOCK_1_25M)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("pokey2", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("pokey3", POKEY, MHAVOC_CLOCK_1_25M)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("pokey3", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("pokey4", POKEY, MHAVOC_CLOCK_1_25M)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("pokey4", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mhavocrv, mhavoc )
- MDRV_SOUND_ADD("tms", TMS5220, MHAVOC_CLOCK/2/9)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5220, MHAVOC_CLOCK/2/9)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( alphaone, mhavoc )
/* basic machine hardware */
- MDRV_CPU_MODIFY("alpha")
- MDRV_CPU_PROGRAM_MAP(alphaone_map)
- MDRV_DEVICE_REMOVE("gamma")
+ MCFG_CPU_MODIFY("alpha")
+ MCFG_CPU_PROGRAM_MAP(alphaone_map)
+ MCFG_DEVICE_REMOVE("gamma")
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 580, 0, 500)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 580, 0, 500)
/* sound hardware */
- MDRV_SOUND_REPLACE("pokey1", POKEY, MHAVOC_CLOCK_1_25M)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_REPLACE("pokey1", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_REPLACE("pokey2", POKEY, MHAVOC_CLOCK_1_25M)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_REPLACE("pokey2", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_DEVICE_REMOVE("pokey3")
- MDRV_DEVICE_REMOVE("pokey4")
+ MCFG_DEVICE_REMOVE("pokey3")
+ MCFG_DEVICE_REMOVE("pokey4")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 363863e859f..27f92e0785b 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -315,55 +315,55 @@ static const duart68681_config micro3d_duart68681_config =
static MACHINE_CONFIG_START( micro3d, micro3d_state )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
- MDRV_CPU_PROGRAM_MAP(hostmem)
- MDRV_CPU_VBLANK_INT("screen", micro3d_vblank)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(hostmem)
+ MCFG_CPU_VBLANK_INT("screen", micro3d_vblank)
- MDRV_CPU_ADD("vgb", TMS34010, XTAL_40MHz)
- MDRV_CPU_CONFIG(vgb_config)
- MDRV_CPU_PROGRAM_MAP(vgbmem)
+ MCFG_CPU_ADD("vgb", TMS34010, XTAL_40MHz)
+ MCFG_CPU_CONFIG(vgb_config)
+ MCFG_CPU_PROGRAM_MAP(vgbmem)
- MDRV_CPU_ADD("drmath", AM29000, XTAL_32MHz / 2)
- MDRV_CPU_PROGRAM_MAP(drmath_prg)
- MDRV_CPU_DATA_MAP(drmath_data)
+ MCFG_CPU_ADD("drmath", AM29000, XTAL_32MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(drmath_prg)
+ MCFG_CPU_DATA_MAP(drmath_data)
- MDRV_CPU_ADD("audiocpu", I8051, XTAL_11_0592MHz)
- MDRV_CPU_PROGRAM_MAP(soundmem_prg)
- MDRV_CPU_IO_MAP(soundmem_io)
+ MCFG_CPU_ADD("audiocpu", I8051, XTAL_11_0592MHz)
+ MCFG_CPU_PROGRAM_MAP(soundmem_prg)
+ MCFG_CPU_IO_MAP(soundmem_io)
- MDRV_DUART68681_ADD("duart68681", XTAL_3_6864MHz, micro3d_duart68681_config)
+ MCFG_DUART68681_ADD("duart68681", XTAL_3_6864MHz, micro3d_duart68681_config)
- MDRV_MACHINE_RESET(micro3d)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_QUANTUM_TIME(HZ(3000))
+ MCFG_MACHINE_RESET(micro3d)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_QUANTUM_TIME(HZ(3000))
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(XTAL_40MHz/8*4, 192*4, 0, 144*4, 434, 0, 400)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz/8*4, 192*4, 0, 144*4, 434, 0, 400)
- MDRV_VIDEO_START(micro3d)
- MDRV_VIDEO_RESET(micro3d)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(micro3d)
+ MCFG_VIDEO_RESET(micro3d)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("upd7759", UPD7759, XTAL_640kHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_SOUND_ADD("upd7759", UPD7759, XTAL_640kHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
- MDRV_SOUND_ADD("ym2151", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.35)
+ MCFG_SOUND_ADD("ym2151", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
- MDRV_SOUND_ADD("noise_1", MICRO3D, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("noise_1", MICRO3D, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("noise_2", MICRO3D, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("noise_2", MICRO3D, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 37b9e3cca1b..6262430d4fb 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -674,67 +674,67 @@ static const ymz280b_interface ymz280b_config =
static MACHINE_CONFIG_START( livequiz, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
- MDRV_CPU_PROGRAM_MAP(livequiz_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(livequiz_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-16-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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-16-1)
- MDRV_GFXDECODE(midas)
- MDRV_PALETTE_LENGTH(0x10000)
+ MCFG_GFXDECODE(midas)
+ MCFG_PALETTE_LENGTH(0x10000)
- MDRV_VIDEO_START(midas)
- MDRV_VIDEO_UPDATE(midas)
+ MCFG_VIDEO_START(midas)
+ MCFG_VIDEO_UPDATE(midas)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hammer, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
- MDRV_CPU_PROGRAM_MAP(hammer_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(hammer_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_TICKET_DISPENSER_ADD("prize1", 1000*5, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
- MDRV_TICKET_DISPENSER_ADD("prize2", 1000*5, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
- MDRV_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
+ MCFG_TICKET_DISPENSER_ADD("prize1", 1000*5, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
+ MCFG_TICKET_DISPENSER_ADD("prize2", 1000*5, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
+ MCFG_TICKET_DISPENSER_ADD("ticket", 200, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
/* 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(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-16-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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-16-1)
- MDRV_GFXDECODE(midas)
- MDRV_PALETTE_LENGTH(0x10000)
+ MCFG_GFXDECODE(midas)
+ MCFG_PALETTE_LENGTH(0x10000)
- MDRV_VIDEO_START(midas)
- MDRV_VIDEO_UPDATE(midas)
+ MCFG_VIDEO_START(midas)
+ MCFG_VIDEO_UPDATE(midas)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c
index 372b9cdc0c7..11aa2102eba 100644
--- a/src/mame/drivers/midqslvr.c
+++ b/src/mame/drivers/midqslvr.c
@@ -44,21 +44,21 @@ static INPUT_PORTS_START( midqslvr )
INPUT_PORTS_END
static MACHINE_CONFIG_START( midqslvr, driver_device )
- MDRV_CPU_ADD("maincpu", PENTIUM, 333000000) // actually Celeron 333
- MDRV_CPU_PROGRAM_MAP(midqslvr_map)
- MDRV_CPU_IO_MAP(midqslvr_io)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 333000000) // actually Celeron 333
+ MCFG_CPU_PROGRAM_MAP(midqslvr_map)
+ MCFG_CPU_IO_MAP(midqslvr_io)
/* 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
- MDRV_PALETTE_LENGTH(16)
-
- MDRV_VIDEO_START(midqslvr)
- MDRV_VIDEO_UPDATE(midqslvr)
+ 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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
+ MCFG_PALETTE_LENGTH(16)
+
+ MCFG_VIDEO_START(midqslvr)
+ MCFG_VIDEO_UPDATE(midqslvr)
MACHINE_CONFIG_END
ROM_START( offrthnd )
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index 0a650ce669a..705cdc79130 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -604,36 +604,36 @@ static const tms34010_config tms_config =
static MACHINE_CONFIG_START( tunit_core, midtunit_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, CPU_CLOCK)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, CPU_CLOCK)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_RESET(midtunit)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(midtunit)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK * 2, 505, 0, 399, 289, 0, 253)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK * 2, 505, 0, 399, 289, 0, 253)
- MDRV_VIDEO_START(midtunit)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(midtunit)
+ MCFG_VIDEO_UPDATE(tms340x0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tunit_adpcm, tunit_core )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(williams_adpcm_sound)
+ MCFG_FRAGMENT_ADD(williams_adpcm_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tunit_dcs, tunit_core )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(dcs_audio_2k)
+ MCFG_FRAGMENT_ADD(dcs_audio_2k)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index 8af9f6c7627..96c42dbb56e 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -1025,50 +1025,50 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( midvcommon, midvunit_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS32031, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(midvunit_map)
+ MCFG_CPU_ADD("maincpu", TMS32031, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(midvunit_map)
- MDRV_MACHINE_START(midvunit)
- MDRV_MACHINE_RESET(midvunit)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(midvunit)
+ MCFG_MACHINE_RESET(midvunit)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_TIMER_ADD("timer0", NULL)
- MDRV_TIMER_ADD("timer1", NULL)
+ MCFG_TIMER_ADD("timer0", NULL)
+ MCFG_TIMER_ADD("timer1", NULL)
/* video hardware */
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MIDVUNIT_VIDEO_CLOCK/2, 666, 0, 512, 432, 0, 400)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MIDVUNIT_VIDEO_CLOCK/2, 666, 0, 512, 432, 0, 400)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(midvunit)
- MDRV_VIDEO_UPDATE(midvunit)
+ MCFG_VIDEO_START(midvunit)
+ MCFG_VIDEO_UPDATE(midvunit)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( midvunit, midvcommon )
/* sound hardware */
- MDRV_FRAGMENT_ADD(dcs_audio_2k)
+ MCFG_FRAGMENT_ADD(dcs_audio_2k)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( midvplus, midvcommon )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CONFIG(midvplus_config)
- MDRV_CPU_PROGRAM_MAP(midvplus_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CONFIG(midvplus_config)
+ MCFG_CPU_PROGRAM_MAP(midvplus_map)
- MDRV_MACHINE_RESET(midvplus)
- MDRV_DEVICE_REMOVE("nvram")
- MDRV_NVRAM_HANDLER(midway_serial_pic2)
+ MCFG_MACHINE_RESET(midvplus)
+ MCFG_DEVICE_REMOVE("nvram")
+ MCFG_NVRAM_HANDLER(midway_serial_pic2)
- MDRV_IDE_CONTROLLER_ADD("ide", NULL)
+ MCFG_IDE_CONTROLLER_ADD("ide", NULL)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dcs2_audio_2115)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2115)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index ba0e5d3a8fe..9f50bda4c52 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -634,25 +634,25 @@ static const tms34010_config tms_config =
static MACHINE_CONFIG_START( wunit, midwxunit_state )
- MDRV_CPU_ADD("maincpu", TMS34010, 50000000)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, 50000000)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_RESET(midwunit)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(midwunit)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 505, 0, 399, 289, 0, 253)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 505, 0, 399, 289, 0, 253)
- MDRV_VIDEO_START(midwunit)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(midwunit)
+ MCFG_VIDEO_UPDATE(tms340x0)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dcs_audio_8k)
+ MCFG_FRAGMENT_ADD(dcs_audio_8k)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index 5ba1b1f2b25..c51b88af08d 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -259,25 +259,25 @@ static const tms34010_config tms_config =
static MACHINE_CONFIG_START( midxunit, midwxunit_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34020, 40000000)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", TMS34020, 40000000)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_RESET(midxunit)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(midxunit)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 505, 0, 399, 289, 0, 253)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 505, 0, 399, 289, 0, 253)
- MDRV_VIDEO_START(midxunit)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(midxunit)
+ MCFG_VIDEO_UPDATE(tms340x0)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dcs_audio_2k_uart)
+ MCFG_FRAGMENT_ADD(dcs_audio_2k_uart)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index 7087214b61c..a0f7a85c495 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -999,26 +999,26 @@ static const tms34010_config yunit_tms_config =
static MACHINE_CONFIG_START( zunit, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, FAST_MASTER_CLOCK)
- MDRV_CPU_CONFIG(zunit_tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, FAST_MASTER_CLOCK)
+ MCFG_CPU_CONFIG(zunit_tms_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_RESET(midyunit)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(midyunit)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MEDRES_PIXEL_CLOCK*2, 673, 0, 511, 433, 0, 399)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MEDRES_PIXEL_CLOCK*2, 673, 0, 511, 433, 0, 399)
- MDRV_VIDEO_START(midzunit)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(midzunit)
+ MCFG_VIDEO_UPDATE(tms340x0)
/* sound hardware */
- MDRV_FRAGMENT_ADD(williams_narc_sound)
+ MCFG_FRAGMENT_ADD(williams_narc_sound)
MACHINE_CONFIG_END
@@ -1032,83 +1032,83 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( yunit_core, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, SLOW_MASTER_CLOCK)
- MDRV_CPU_CONFIG(yunit_tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, SLOW_MASTER_CLOCK)
+ MCFG_CPU_CONFIG(yunit_tms_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_RESET(midyunit)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(midyunit)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(STDRES_PIXEL_CLOCK*2, 505, 0, 399, 289, 0, 253)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(STDRES_PIXEL_CLOCK*2, 505, 0, 399, 289, 0, 253)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_UPDATE(tms340x0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yunit_cvsd_4bit_slow, yunit_core )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(williams_cvsd_sound)
+ MCFG_FRAGMENT_ADD(williams_cvsd_sound)
/* video hardware */
- MDRV_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(midyunit_4bit)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_VIDEO_START(midyunit_4bit)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yunit_cvsd_4bit_fast, yunit_core )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(FAST_MASTER_CLOCK)
- MDRV_FRAGMENT_ADD(williams_cvsd_sound)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(FAST_MASTER_CLOCK)
+ MCFG_FRAGMENT_ADD(williams_cvsd_sound)
/* video hardware */
- MDRV_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(midyunit_4bit)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_VIDEO_START(midyunit_4bit)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yunit_cvsd_6bit_slow, yunit_core )
/* basic machine hardware */
- MDRV_FRAGMENT_ADD(williams_cvsd_sound)
+ MCFG_FRAGMENT_ADD(williams_cvsd_sound)
/* video hardware */
- MDRV_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(midyunit_6bit)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_VIDEO_START(midyunit_6bit)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yunit_adpcm_6bit_fast, yunit_core )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(FAST_MASTER_CLOCK)
- MDRV_FRAGMENT_ADD(williams_adpcm_sound)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(FAST_MASTER_CLOCK)
+ MCFG_FRAGMENT_ADD(williams_adpcm_sound)
/* video hardware */
- MDRV_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(midyunit_6bit)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_VIDEO_START(midyunit_6bit)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yunit_adpcm_6bit_faster, yunit_core )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(FASTER_MASTER_CLOCK)
- MDRV_FRAGMENT_ADD(williams_adpcm_sound)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(FASTER_MASTER_CLOCK)
+ MCFG_FRAGMENT_ADD(williams_adpcm_sound)
/* video hardware */
- MDRV_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(midyunit_6bit)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_VIDEO_START(midyunit_6bit)
MACHINE_CONFIG_END
@@ -1116,18 +1116,18 @@ static MACHINE_CONFIG_DERIVED( mkyawdim, yunit_core )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(yawdim_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(yawdim_sound_map)
/* video hardware */
- MDRV_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(mkyawdim)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_VIDEO_START(mkyawdim)
/* 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/midzeus.c b/src/mame/drivers/midzeus.c
index 4ff7d1c5751..9571c678841 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -1095,26 +1095,26 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( midzeus, midzeus_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(zeus_map)
- MDRV_CPU_VBLANK_INT("screen", display_irq)
+ MCFG_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(zeus_map)
+ MCFG_CPU_VBLANK_INT("screen", display_irq)
- MDRV_MACHINE_START(midzeus)
- MDRV_MACHINE_RESET(midzeus)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(midzeus)
+ MCFG_MACHINE_RESET(midzeus)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MIDZEUS_VIDEO_CLOCK/8, 529, 0, 400, 278, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MIDZEUS_VIDEO_CLOCK/8, 529, 0, 400, 278, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_VIDEO_START(midzeus)
- MDRV_VIDEO_UPDATE(midzeus)
+ MCFG_VIDEO_START(midzeus)
+ MCFG_VIDEO_UPDATE(midzeus)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dcs2_audio_2104)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2104)
MACHINE_CONFIG_END
static READ8_HANDLER( PIC16C5X_T0_clk_r )
@@ -1129,33 +1129,33 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( invasn, midzeus )
- MDRV_CPU_ADD("pic", PIC16C57, 8000000) /* ? */
- MDRV_CPU_IO_MAP(pic_io_map)
+ MCFG_CPU_ADD("pic", PIC16C57, 8000000) /* ? */
+ MCFG_CPU_IO_MAP(pic_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( midzeus2, midzeus_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(zeus2_map)
- MDRV_CPU_VBLANK_INT("screen", display_irq)
+ MCFG_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(zeus2_map)
+ MCFG_CPU_VBLANK_INT("screen", display_irq)
- MDRV_MACHINE_START(midzeus)
- MDRV_MACHINE_RESET(midzeus)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(midzeus)
+ MCFG_MACHINE_RESET(midzeus)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MIDZEUS_VIDEO_CLOCK/4, 666, 0, 512, 438, 0, 400)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MIDZEUS_VIDEO_CLOCK/4, 666, 0, 512, 438, 0, 400)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_VIDEO_START(midzeus2)
- MDRV_VIDEO_UPDATE(midzeus2)
+ MCFG_VIDEO_START(midzeus2)
+ MCFG_VIDEO_UPDATE(midzeus2)
/* sound hardware */
- MDRV_FRAGMENT_ADD(dcs2_audio_2104)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2104)
- MDRV_M48T35_ADD( "m48t35" )
+ MCFG_M48T35_ADD( "m48t35" )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index 5a9cdc5da53..07ea2a54b40 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -247,39 +247,39 @@ static MACHINE_RESET( mikie )
static MACHINE_CONFIG_START( mikie, mikie_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, OSC/12)
- MDRV_CPU_PROGRAM_MAP(mikie_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, OSC/12)
+ MCFG_CPU_PROGRAM_MAP(mikie_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, CLK)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, CLK)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(mikie)
- MDRV_MACHINE_RESET(mikie)
+ MCFG_MACHINE_START(mikie)
+ MCFG_MACHINE_RESET(mikie)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.59)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.59)
+ 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)
- MDRV_GFXDECODE(mikie)
- MDRV_PALETTE_LENGTH(16*8*16+16*8*16)
+ MCFG_GFXDECODE(mikie)
+ MCFG_PALETTE_LENGTH(16*8*16+16*8*16)
- MDRV_PALETTE_INIT(mikie)
- MDRV_VIDEO_START(mikie)
- MDRV_VIDEO_UPDATE(mikie)
+ MCFG_PALETTE_INIT(mikie)
+ MCFG_VIDEO_START(mikie)
+ MCFG_VIDEO_UPDATE(mikie)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489A, XTAL/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("sn1", SN76489A, XTAL/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("sn2", SN76489A, CLK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("sn2", SN76489A, CLK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c
index a9b2d1cd995..db5eb5edabf 100644
--- a/src/mame/drivers/mil4000.c
+++ b/src/mame/drivers/mil4000.c
@@ -345,28 +345,28 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mil4000, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 12000000 ) // ?
- MDRV_CPU_PROGRAM_MAP(mil4000_map)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000 ) // ?
+ MCFG_CPU_PROGRAM_MAP(mil4000_map)
// irq 2/4/5 point to the same place, others invalid
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
- MDRV_PALETTE_LENGTH(0x800)
- MDRV_GFXDECODE(mil4000)
- MDRV_VIDEO_START(mil4000)
- MDRV_VIDEO_UPDATE(mil4000)
+ MCFG_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(mil4000)
+ MCFG_VIDEO_START(mil4000)
+ MCFG_VIDEO_UPDATE(mil4000)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // frequency from 1000 kHz resonator. pin 7 high not verified.
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // frequency from 1000 kHz resonator. pin 7 high not verified.
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c
index 57102132c9c..9a21d38e6f7 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -432,35 +432,35 @@ static const ay8910_interface miniboy7_ay8910_intf =
static MACHINE_CONFIG_START( miniboy7, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */
- MDRV_CPU_PROGRAM_MAP(miniboy7_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */
+ MCFG_CPU_PROGRAM_MAP(miniboy7_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", miniboy7_pia0_intf)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_PIA6821_ADD("pia0", miniboy7_pia0_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((47+1)*8, (39+1)*8) /* Taken from MC6845, registers 00 & 04. Normally programmed with (value-1) */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 37*8-1, 0*8, 37*8-1) /* Taken from MC6845, registers 01 & 06 */
+ 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((47+1)*8, (39+1)*8) /* Taken from MC6845, registers 00 & 04. Normally programmed with (value-1) */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 37*8-1, 0*8, 37*8-1) /* Taken from MC6845, registers 01 & 06 */
- MDRV_GFXDECODE(miniboy7)
+ MCFG_GFXDECODE(miniboy7)
- MDRV_PALETTE_INIT(miniboy7)
- MDRV_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(miniboy7)
- MDRV_VIDEO_UPDATE(miniboy7)
+ MCFG_PALETTE_INIT(miniboy7)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_VIDEO_START(miniboy7)
+ MCFG_VIDEO_UPDATE(miniboy7)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/12, mc6845_intf) /* guess */
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/12, mc6845_intf) /* guess */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */
- MDRV_SOUND_CONFIG(miniboy7_ay8910_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */
+ MCFG_SOUND_CONFIG(miniboy7_ay8910_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c
index 942ab4e96bb..2334432e706 100644
--- a/src/mame/drivers/minivadr.c
+++ b/src/mame/drivers/minivadr.c
@@ -81,19 +81,19 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( minivadr, minivadr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,24000000 / 6) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(minivadr_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,24000000 / 6) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(minivadr_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_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
-
- MDRV_VIDEO_UPDATE(minivadr)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
+
+ MCFG_VIDEO_UPDATE(minivadr)
/* the board has no sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index 358bce60deb..5e15727079e 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -383,39 +383,39 @@ static MACHINE_RESET( mirage )
static MACHINE_CONFIG_START( mirage, mirage_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 28000000/2)
- MDRV_CPU_PROGRAM_MAP(mirage_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 28000000/2)
+ MCFG_CPU_PROGRAM_MAP(mirage_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(mirage)
- MDRV_MACHINE_RESET(mirage)
+ MCFG_MACHINE_START(mirage)
+ MCFG_MACHINE_RESET(mirage)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(mirage)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(mirage)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_UPDATE(mirage)
- MDRV_VIDEO_EOF(mirage)
+ MCFG_VIDEO_UPDATE(mirage)
+ MCFG_VIDEO_EOF(mirage)
- MDRV_DECO16IC_ADD("deco_custom", mirage_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", mirage_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki_bgm", 2000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_OKIM6295_ADD("oki_bgm", 2000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_OKIM6295_ADD("oki_sfx", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_OKIM6295_ADD("oki_sfx", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index f0e629d7d63..d964c3ccdc3 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -377,35 +377,35 @@ static INTERRUPT_GEN( mirax_vblank_irq )
}
static MACHINE_CONFIG_START( mirax, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, 12000000/4) // ceramic potted module, encrypted z80
- MDRV_CPU_PROGRAM_MAP(mirax_main_map)
- MDRV_CPU_VBLANK_INT("screen",mirax_vblank_irq)
+ MCFG_CPU_ADD("maincpu", Z80, 12000000/4) // ceramic potted module, encrypted z80
+ MCFG_CPU_PROGRAM_MAP(mirax_main_map)
+ MCFG_CPU_VBLANK_INT("screen",mirax_vblank_irq)
- MDRV_CPU_ADD("audiocpu", Z80, 12000000/4)
- MDRV_CPU_PROGRAM_MAP(mirax_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
+ MCFG_CPU_ADD("audiocpu", Z80, 12000000/4)
+ MCFG_CPU_PROGRAM_MAP(mirax_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
-
- MDRV_PALETTE_LENGTH(0x40)
- MDRV_PALETTE_INIT(mirax)
- MDRV_GFXDECODE(mirax)
- MDRV_VIDEO_START(mirax)
- MDRV_VIDEO_UPDATE(mirax)
-
- MDRV_SOUND_START(mirax)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 12000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("ay2", AY8910, 12000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+
+ MCFG_PALETTE_LENGTH(0x40)
+ MCFG_PALETTE_INIT(mirax)
+ MCFG_GFXDECODE(mirax)
+ MCFG_VIDEO_START(mirax)
+ MCFG_VIDEO_UPDATE(mirax)
+
+ MCFG_SOUND_START(mirax)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay1", AY8910, 12000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ay2", AY8910, 12000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 23dfee966ec..20987e92326 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -382,46 +382,46 @@ static MACHINE_RESET( missb2 )
static MACHINE_CONFIG_START( missb2, bublbobl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
- MDRV_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("slave", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(sound_map)
-// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_VBLANK_INT("screen", missb2_interrupt)
+ MCFG_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+// MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_VBLANK_INT("screen", missb2_interrupt)
- MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
+ MCFG_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
- MDRV_MACHINE_START(missb2)
- MDRV_MACHINE_RESET(missb2)
+ MCFG_MACHINE_START(missb2)
+ MCFG_MACHINE_RESET(missb2)
/* 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, 32*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, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(missb2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(missb2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_UPDATE(missb2)
+ MCFG_VIDEO_UPDATE(missb2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, MAIN_XTAL/8)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM3526, MAIN_XTAL/8)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 800ba79c8ec..2c651e53c3c 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -1020,28 +1020,28 @@ static const pokey_interface pokey_config =
static MACHINE_CONFIG_START( missile, missile_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(missile)
- MDRV_MACHINE_RESET(missile)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_START(missile)
+ MCFG_MACHINE_RESET(missile)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
/* video hardware */
- MDRV_PALETTE_LENGTH(8)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_VIDEO_UPDATE(missile)
+ MCFG_VIDEO_UPDATE(missile)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 2a69b3b08d5..cb0c8f6ae61 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -1106,77 +1106,77 @@ static MACHINE_RESET( mitchell )
static MACHINE_CONFIG_START( mgakuen, mitchell_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* probably same clock as the other mitchell hardware games */
- MDRV_CPU_PROGRAM_MAP(mgakuen_map)
- MDRV_CPU_IO_MAP(mitchell_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* probably same clock as the other mitchell hardware games */
+ MCFG_CPU_PROGRAM_MAP(mgakuen_map)
+ MCFG_CPU_IO_MAP(mitchell_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
- MDRV_MACHINE_START(mitchell)
- MDRV_MACHINE_RESET(mitchell)
+ MCFG_MACHINE_START(mitchell)
+ MCFG_MACHINE_RESET(mitchell)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
+ 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(mgakuen)
- MDRV_PALETTE_LENGTH(1024) /* less colors than the others */
+ MCFG_GFXDECODE(mgakuen)
+ MCFG_PALETTE_LENGTH(1024) /* less colors than the others */
- MDRV_VIDEO_START(pang)
- MDRV_VIDEO_UPDATE(pang)
+ MCFG_VIDEO_START(pang)
+ MCFG_VIDEO_UPDATE(pang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* probably same clock as the other mitchell hardware games */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* probably same clock as the other mitchell hardware games */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_16MHz/4) /* probably same clock as the other mitchell hardware games */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_16MHz/4) /* probably same clock as the other mitchell hardware games */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pang, mitchell_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mitchell_map)
- MDRV_CPU_IO_MAP(mitchell_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
+ MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mitchell_map)
+ MCFG_CPU_IO_MAP(mitchell_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
- MDRV_MACHINE_START(mitchell)
- MDRV_MACHINE_RESET(mitchell)
+ MCFG_MACHINE_START(mitchell)
+ MCFG_MACHINE_RESET(mitchell)
- MDRV_NVRAM_HANDLER(mitchell)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_HANDLER(mitchell)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.42) /* verified on pcb */
- 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.42) /* verified on pcb */
+ 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(mitchell)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(mitchell)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(pang)
- MDRV_VIDEO_UPDATE(pang)
+ MCFG_VIDEO_START(pang)
+ MCFG_VIDEO_UPDATE(pang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ymsnd",YM2413, XTAL_16MHz/4) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static const gfx_layout blcharlayout =
@@ -1218,23 +1218,23 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_DERIVED( spangbl, pang )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spangbl_map)
- MDRV_CPU_IO_MAP(spangbl_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spangbl_map)
+ MCFG_CPU_IO_MAP(spangbl_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(spangbl_sound_map)
- MDRV_CPU_IO_MAP(spangbl_sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(spangbl_sound_map)
+ MCFG_CPU_IO_MAP(spangbl_sound_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+// MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_GFXDECODE(spangbl)
+ MCFG_GFXDECODE(spangbl)
- MDRV_DEVICE_REMOVE("oki")
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_DEVICE_REMOVE("oki")
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mstworld, mitchell_state )
@@ -1243,72 +1243,72 @@ static MACHINE_CONFIG_START( mstworld, mitchell_state )
/* it doesn't glitch with the clock speed set to 4x normal, however this is incorrect..
the interrupt handling (and probably various irq flags / vbl flags handling etc.) is
more likely wrong.. the game appears to run too fast anyway .. */
- MDRV_CPU_ADD("maincpu", Z80, 6000000*4)
- MDRV_CPU_PROGRAM_MAP(mitchell_map)
- MDRV_CPU_IO_MAP(mstworld_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 6000000*4)
+ MCFG_CPU_PROGRAM_MAP(mitchell_map)
+ MCFG_CPU_IO_MAP(mstworld_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(mstworld_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz? */
+ MCFG_CPU_PROGRAM_MAP(mstworld_sound_map)
- MDRV_MACHINE_START(mitchell)
- MDRV_MACHINE_RESET(mitchell)
+ MCFG_MACHINE_START(mitchell)
+ MCFG_MACHINE_RESET(mitchell)
/* 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
+ 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(mstworld)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(mstworld)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(pang)
- MDRV_VIDEO_UPDATE(pang)
+ MCFG_VIDEO_START(pang)
+ MCFG_VIDEO_UPDATE(pang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 990000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 990000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( marukin, mitchell_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mitchell_map)
- MDRV_CPU_IO_MAP(mitchell_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mitchell_map)
+ MCFG_CPU_IO_MAP(mitchell_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
- MDRV_NVRAM_HANDLER(mitchell)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_HANDLER(mitchell)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
+ 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(marukin)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(marukin)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(pang)
- MDRV_VIDEO_UPDATE(pang)
+ MCFG_VIDEO_START(pang)
+ MCFG_VIDEO_UPDATE(pang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_16MHz/4) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/*
@@ -1332,36 +1332,36 @@ Vsync is 59.09hz
static MACHINE_CONFIG_START( pkladiesbl, mitchell_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mitchell_map)
- MDRV_CPU_IO_MAP(mitchell_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mitchell_map)
+ MCFG_CPU_IO_MAP(mitchell_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
- MDRV_NVRAM_HANDLER(mitchell)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_HANDLER(mitchell)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.09) /* verified on pcb */
- 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.09) /* verified on pcb */
+ 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(8*8, (64-8)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(pkladiesbl)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(pkladiesbl)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(pang)
- MDRV_VIDEO_UPDATE(pang)
+ MCFG_VIDEO_START(pang)
+ MCFG_VIDEO_UPDATE(pang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* It should be a OKIM5205 with a 384khz resonator */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* It should be a OKIM5205 with a 384khz resonator */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, 3750000) /* verified on pcb, read the comments */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3750000) /* verified on pcb, read the comments */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index f70beb49460..dabeb65344b 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -375,39 +375,39 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mjkjidai, mjkjidai_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(mjkjidai_map)
- MDRV_CPU_IO_MAP(mjkjidai_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(mjkjidai_map)
+ MCFG_CPU_IO_MAP(mjkjidai_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_NVRAM_HANDLER(mjkjidai)
+ MCFG_NVRAM_HANDLER(mjkjidai)
/* 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(3*8, 61*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(3*8, 61*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mjkjidai)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(mjkjidai)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(mjkjidai)
- MDRV_VIDEO_UPDATE(mjkjidai)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(mjkjidai)
+ MCFG_VIDEO_UPDATE(mjkjidai)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, 10000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76489, 10000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76489, 10000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76489, 10000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("adpcm", MJKJIDAI, 6000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("adpcm", MJKJIDAI, 6000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 10fae305a23..b2331043a9e 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -494,37 +494,37 @@ static MACHINE_RESET( mjsister )
static MACHINE_CONFIG_START( mjsister, mjsister_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
- MDRV_CPU_PROGRAM_MAP(mjsister_map)
- MDRV_CPU_IO_MAP(mjsister_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(mjsister_map)
+ MCFG_CPU_IO_MAP(mjsister_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_MACHINE_START(mjsister)
- MDRV_MACHINE_RESET(mjsister)
+ MCFG_MACHINE_START(mjsister)
+ MCFG_MACHINE_RESET(mjsister)
/* 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(256+4, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255+4, 8, 247)
+ 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(256+4, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255+4, 8, 247)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(mjsister)
- MDRV_VIDEO_UPDATE(mjsister)
+ MCFG_VIDEO_START(mjsister)
+ MCFG_VIDEO_UPDATE(mjsister)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MCLK/8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("aysnd", AY8910, MCLK/8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- 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/mlanding.c b/src/mame/drivers/mlanding.c
index cd9df879bf5..574189f2da2 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -720,56 +720,56 @@ static MACHINE_RESET( mlanding )
static MACHINE_CONFIG_START( mlanding, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000 ) /* 12 MHz ??? (guess) */
- MDRV_CPU_PROGRAM_MAP(mlanding_mem)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000 ) /* 12 MHz ??? (guess) */
+ MCFG_CPU_PROGRAM_MAP(mlanding_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000 ) /* 4 MHz ??? (guess) */
- MDRV_CPU_PROGRAM_MAP(mlanding_z80_mem)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000 ) /* 4 MHz ??? (guess) */
+ MCFG_CPU_PROGRAM_MAP(mlanding_z80_mem)
- MDRV_CPU_ADD("sub", M68000, 12000000 ) /* 12 MHz ??? (guess) */
- MDRV_CPU_PROGRAM_MAP(mlanding_sub_mem)
- MDRV_CPU_VBLANK_INT_HACK(irq6_line_hold,7)
+ MCFG_CPU_ADD("sub", M68000, 12000000 ) /* 12 MHz ??? (guess) */
+ MCFG_CPU_PROGRAM_MAP(mlanding_sub_mem)
+ MCFG_CPU_VBLANK_INT_HACK(irq6_line_hold,7)
- MDRV_CPU_ADD("z80sub", Z80, 4000000 ) /* 4 MHz ??? (guess) */
- MDRV_CPU_PROGRAM_MAP(mlanding_z80_sub_mem)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("z80sub", Z80, 4000000 ) /* 4 MHz ??? (guess) */
+ MCFG_CPU_PROGRAM_MAP(mlanding_z80_sub_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("dsp", TMS32025,12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(DSP_map_program)
- MDRV_CPU_DATA_MAP(DSP_map_data)
- MDRV_CPU_IO_MAP(DSP_map_io)
+ MCFG_CPU_ADD("dsp", TMS32025,12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(DSP_map_program)
+ MCFG_CPU_DATA_MAP(DSP_map_data)
+ MCFG_CPU_IO_MAP(DSP_map_io)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- 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(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 14*8, 511)
+ 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(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 14*8, 511)
- MDRV_PALETTE_LENGTH(512*16)
+ MCFG_PALETTE_LENGTH(512*16)
- MDRV_VIDEO_START(mlanding)
- MDRV_VIDEO_UPDATE(mlanding)
+ MCFG_VIDEO_START(mlanding)
+ MCFG_VIDEO_UPDATE(mlanding)
- MDRV_MACHINE_RESET(mlanding)
+ MCFG_MACHINE_RESET(mlanding)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MDRV_TC0140SYT_ADD("tc0140syt", mlanding_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", mlanding_tc0140syt_intf)
MACHINE_CONFIG_END
ROM_START( mlanding )
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 3a9cf9ca233..10a20554055 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -1498,87 +1498,87 @@ ROM_END
static MACHINE_CONFIG_START( model1, driver_device )
- MDRV_CPU_ADD("maincpu", V60, 16000000)
- MDRV_CPU_PROGRAM_MAP(model1_mem)
- MDRV_CPU_IO_MAP(model1_io)
- MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2)
+ MCFG_CPU_ADD("maincpu", V60, 16000000)
+ MCFG_CPU_PROGRAM_MAP(model1_mem)
+ MCFG_CPU_IO_MAP(model1_io)
+ MCFG_CPU_VBLANK_INT_HACK(model1_interrupt, 2)
- MDRV_CPU_ADD("audiocpu", M68000, 10000000) // verified on real h/w
- MDRV_CPU_PROGRAM_MAP(model1_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 10000000) // verified on real h/w
+ MCFG_CPU_PROGRAM_MAP(model1_snd)
- MDRV_MACHINE_START(model1)
- MDRV_MACHINE_RESET(model1)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(model1)
+ MCFG_MACHINE_RESET(model1)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(XTAL_16MHz, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(model1)
- MDRV_VIDEO_UPDATE(model1)
- MDRV_VIDEO_EOF(model1)
+ MCFG_VIDEO_START(model1)
+ MCFG_VIDEO_UPDATE(model1)
+ MCFG_VIDEO_EOF(model1)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3438, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM3438, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("sega1", MULTIPCM, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("sega2", MULTIPCM, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( model1_vr, driver_device )
- MDRV_CPU_ADD("maincpu", V60, 16000000)
- MDRV_CPU_PROGRAM_MAP(model1_vr_mem)
- MDRV_CPU_IO_MAP(model1_vr_io)
- MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2)
+ MCFG_CPU_ADD("maincpu", V60, 16000000)
+ MCFG_CPU_PROGRAM_MAP(model1_vr_mem)
+ MCFG_CPU_IO_MAP(model1_vr_io)
+ MCFG_CPU_VBLANK_INT_HACK(model1_interrupt, 2)
- MDRV_CPU_ADD("audiocpu", M68000, 10000000) // verified on real h/w
- MDRV_CPU_PROGRAM_MAP(model1_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 10000000) // verified on real h/w
+ MCFG_CPU_PROGRAM_MAP(model1_snd)
- MDRV_CPU_ADD("tgp", MB86233, 16000000)
- MDRV_CPU_CONFIG(model1_vr_tgp_config)
- MDRV_CPU_PROGRAM_MAP(model1_vr_tgp_map)
+ MCFG_CPU_ADD("tgp", MB86233, 16000000)
+ MCFG_CPU_CONFIG(model1_vr_tgp_config)
+ MCFG_CPU_PROGRAM_MAP(model1_vr_tgp_map)
- MDRV_MACHINE_START(model1)
- MDRV_MACHINE_RESET(model1_vr)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(model1)
+ MCFG_MACHINE_RESET(model1_vr)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(XTAL_16MHz, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(model1)
- MDRV_VIDEO_UPDATE(model1)
- MDRV_VIDEO_EOF(model1)
+ MCFG_VIDEO_START(model1)
+ MCFG_VIDEO_UPDATE(model1)
+ MCFG_VIDEO_EOF(model1)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3438, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM3438, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("sega1", MULTIPCM, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("sega2", MULTIPCM, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
GAME( 1993, vf, 0, model1, vf, 0, ROT0, "Sega", "Virtua Fighter", GAME_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index ad91f862345..a2742a5d70c 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1983,108 +1983,108 @@ static const mb86233_cpu_core tgp_config =
/* original Model 2 */
static MACHINE_CONFIG_START( model2o, driver_device )
- MDRV_CPU_ADD("maincpu", I960, 25000000)
- MDRV_CPU_PROGRAM_MAP(model2o_mem)
- MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
+ MCFG_CPU_ADD("maincpu", I960, 25000000)
+ MCFG_CPU_PROGRAM_MAP(model2o_mem)
+ MCFG_CPU_VBLANK_INT_HACK(model2_interrupt,2)
- MDRV_CPU_ADD("audiocpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(model1_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(model1_snd)
- MDRV_CPU_ADD("tgp", MB86233, 16000000)
- MDRV_CPU_CONFIG(tgp_config)
- MDRV_CPU_PROGRAM_MAP(copro_tgp_map)
+ MCFG_CPU_ADD("tgp", MB86233, 16000000)
+ MCFG_CPU_CONFIG(tgp_config)
+ MCFG_CPU_PROGRAM_MAP(copro_tgp_map)
- MDRV_MACHINE_RESET(model2o)
+ MCFG_MACHINE_RESET(model2o)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_NVRAM_ADD_1FILL("backup1")
- MDRV_NVRAM_ADD_1FILL("backup2")
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_NVRAM_ADD_1FILL("backup1")
+ MCFG_NVRAM_ADD_1FILL("backup2")
- MDRV_TIMER_ADD("timer0", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)0)
- MDRV_TIMER_ADD("timer1", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)1)
- MDRV_TIMER_ADD("timer2", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)2)
- MDRV_TIMER_ADD("timer3", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)3)
+ MCFG_TIMER_ADD("timer0", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)0)
+ MCFG_TIMER_ADD("timer1", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)1)
+ MCFG_TIMER_ADD("timer2", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)2)
+ MCFG_TIMER_ADD("timer3", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)3)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
- 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(62*8, 48*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*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_RGB32)
+ MCFG_SCREEN_SIZE(62*8, 48*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*8-1)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(model2)
- MDRV_VIDEO_UPDATE(model2)
+ MCFG_VIDEO_START(model2)
+ MCFG_VIDEO_UPDATE(model2)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3438, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM3438, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("sega1", MULTIPCM, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("sega2", MULTIPCM, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/* 2A-CRX */
static MACHINE_CONFIG_START( model2a, driver_device )
- MDRV_CPU_ADD("maincpu", I960, 25000000)
- MDRV_CPU_PROGRAM_MAP(model2a_crx_mem)
- MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
+ MCFG_CPU_ADD("maincpu", I960, 25000000)
+ MCFG_CPU_PROGRAM_MAP(model2a_crx_mem)
+ MCFG_CPU_VBLANK_INT_HACK(model2_interrupt,2)
- MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model2_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(model2_snd)
- MDRV_CPU_ADD("tgp", MB86233, 16000000)
- MDRV_CPU_CONFIG(tgp_config)
- MDRV_CPU_PROGRAM_MAP(copro_tgp_map)
+ MCFG_CPU_ADD("tgp", MB86233, 16000000)
+ MCFG_CPU_CONFIG(tgp_config)
+ MCFG_CPU_PROGRAM_MAP(copro_tgp_map)
- MDRV_MACHINE_RESET(model2)
+ MCFG_MACHINE_RESET(model2)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_NVRAM_ADD_1FILL("backup1")
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_NVRAM_ADD_1FILL("backup1")
- MDRV_TIMER_ADD("timer0", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)0)
- MDRV_TIMER_ADD("timer1", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)1)
- MDRV_TIMER_ADD("timer2", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)2)
- MDRV_TIMER_ADD("timer3", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)3)
+ MCFG_TIMER_ADD("timer0", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)0)
+ MCFG_TIMER_ADD("timer1", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)1)
+ MCFG_TIMER_ADD("timer2", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)2)
+ MCFG_TIMER_ADD("timer3", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)3)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
- 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(62*8, 48*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*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_RGB32)
+ MCFG_SCREEN_SIZE(62*8, 48*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*8-1)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(model2)
- MDRV_VIDEO_UPDATE(model2)
+ MCFG_VIDEO_START(model2)
+ MCFG_VIDEO_UPDATE(model2)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("scsp", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SOUND_ADD("scsp", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
static READ8_HANDLER( driveio_port_r )
@@ -2122,10 +2122,10 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( srallyc, model2a )
- MDRV_CPU_ADD("drivecpu", Z80, 16000000/4) //???
- MDRV_CPU_PROGRAM_MAP(drive_map)
- MDRV_CPU_IO_MAP(drive_io_map)
-// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("drivecpu", Z80, 16000000/4) //???
+ MCFG_CPU_PROGRAM_MAP(drive_map)
+ MCFG_CPU_IO_MAP(drive_io_map)
+// MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
static const sharc_config sharc_cfg =
@@ -2135,102 +2135,102 @@ static const sharc_config sharc_cfg =
/* 2B-CRX */
static MACHINE_CONFIG_START( model2b, driver_device )
- MDRV_CPU_ADD("maincpu", I960, 25000000)
- MDRV_CPU_PROGRAM_MAP(model2b_crx_mem)
- MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
+ MCFG_CPU_ADD("maincpu", I960, 25000000)
+ MCFG_CPU_PROGRAM_MAP(model2b_crx_mem)
+ MCFG_CPU_VBLANK_INT_HACK(model2_interrupt,2)
- MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model2_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(model2_snd)
- MDRV_CPU_ADD("dsp", ADSP21062, 40000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(copro_sharc_map)
+ MCFG_CPU_ADD("dsp", ADSP21062, 40000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(copro_sharc_map)
- //MDRV_CPU_ADD("dsp2", ADSP21062, 40000000)
- //MDRV_CPU_CONFIG(sharc_cfg)
- //MDRV_CPU_DATA_MAP(geo_sharc_map)
+ //MCFG_CPU_ADD("dsp2", ADSP21062, 40000000)
+ //MCFG_CPU_CONFIG(sharc_cfg)
+ //MCFG_CPU_DATA_MAP(geo_sharc_map)
- MDRV_QUANTUM_TIME(HZ(18000))
+ MCFG_QUANTUM_TIME(HZ(18000))
- MDRV_MACHINE_RESET(model2b)
+ MCFG_MACHINE_RESET(model2b)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_NVRAM_ADD_1FILL("backup1")
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_NVRAM_ADD_1FILL("backup1")
- MDRV_TIMER_ADD("timer0", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)0)
- MDRV_TIMER_ADD("timer1", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)1)
- MDRV_TIMER_ADD("timer2", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)2)
- MDRV_TIMER_ADD("timer3", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)3)
+ MCFG_TIMER_ADD("timer0", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)0)
+ MCFG_TIMER_ADD("timer1", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)1)
+ MCFG_TIMER_ADD("timer2", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)2)
+ MCFG_TIMER_ADD("timer3", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)3)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
- 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(62*8, 48*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*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_RGB32)
+ MCFG_SCREEN_SIZE(62*8, 48*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*8-1)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(model2)
- MDRV_VIDEO_UPDATE(model2)
+ MCFG_VIDEO_START(model2)
+ MCFG_VIDEO_UPDATE(model2)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("scsp", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SOUND_ADD("scsp", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
/* 2C-CRX */
static MACHINE_CONFIG_START( model2c, driver_device )
- MDRV_CPU_ADD("maincpu", I960, 25000000)
- MDRV_CPU_PROGRAM_MAP(model2c_crx_mem)
- MDRV_CPU_VBLANK_INT_HACK(model2c_interrupt,3)
+ MCFG_CPU_ADD("maincpu", I960, 25000000)
+ MCFG_CPU_PROGRAM_MAP(model2c_crx_mem)
+ MCFG_CPU_VBLANK_INT_HACK(model2c_interrupt,3)
- MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model2_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(model2_snd)
- MDRV_MACHINE_RESET(model2c)
+ MCFG_MACHINE_RESET(model2c)
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_NVRAM_ADD_1FILL("backup1")
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_NVRAM_ADD_1FILL("backup1")
- MDRV_TIMER_ADD("timer0", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)0)
- MDRV_TIMER_ADD("timer1", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)1)
- MDRV_TIMER_ADD("timer2", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)2)
- MDRV_TIMER_ADD("timer3", model2_timer_cb)
- MDRV_TIMER_PTR((FPTR)3)
+ MCFG_TIMER_ADD("timer0", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)0)
+ MCFG_TIMER_ADD("timer1", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)1)
+ MCFG_TIMER_ADD("timer2", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)2)
+ MCFG_TIMER_ADD("timer3", model2_timer_cb)
+ MCFG_TIMER_PTR((FPTR)3)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
- 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(62*8, 48*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*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_RGB32)
+ MCFG_SCREEN_SIZE(62*8, 48*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 62*8-1, 0*8, 48*8-1)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(model2)
- MDRV_VIDEO_UPDATE(model2)
+ MCFG_VIDEO_START(model2)
+ MCFG_VIDEO_UPDATE(model2)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("scsp", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SOUND_ADD("scsp", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
/* ROM definitions */
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 841e275b4a6..03463134e43 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -4971,166 +4971,166 @@ static const powerpc_config model3_2x =
};
static MACHINE_CONFIG_START( model3_10, driver_device )
- MDRV_CPU_ADD("maincpu", PPC603E, 66000000)
- MDRV_CPU_CONFIG(model3_10)
- MDRV_CPU_PROGRAM_MAP(model3_mem)
- MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
+ MCFG_CPU_ADD("maincpu", PPC603E, 66000000)
+ MCFG_CPU_CONFIG(model3_10)
+ MCFG_CPU_PROGRAM_MAP(model3_mem)
+ MCFG_CPU_VBLANK_INT_HACK(model3_interrupt,2)
- MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model3_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(model3_snd)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(model3_10)
- MDRV_MACHINE_RESET(model3_10)
+ MCFG_MACHINE_START(model3_10)
+ MCFG_MACHINE_RESET(model3_10)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_NVRAM_ADD_1FILL("backup")
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_ADD_1FILL("backup")
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VISIBLE_AREA(0, 495, 0, 383)
- MDRV_SCREEN_SIZE(512, 400)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 383)
+ MCFG_SCREEN_SIZE(512, 400)
- MDRV_PALETTE_LENGTH(32768)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_VIDEO_START(model3)
- MDRV_VIDEO_UPDATE(model3)
+ MCFG_VIDEO_START(model3)
+ MCFG_VIDEO_UPDATE(model3)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("scsp1", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("scsp1", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
- MDRV_SOUND_ADD("scsp2", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp2_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SOUND_ADD("scsp2", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp2_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( model3_15, driver_device )
- MDRV_CPU_ADD("maincpu", PPC603E, 100000000)
- MDRV_CPU_CONFIG(model3_15)
- MDRV_CPU_PROGRAM_MAP(model3_mem)
- MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
+ MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
+ MCFG_CPU_CONFIG(model3_15)
+ MCFG_CPU_PROGRAM_MAP(model3_mem)
+ MCFG_CPU_VBLANK_INT_HACK(model3_interrupt,2)
- MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model3_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(model3_snd)
- MDRV_MACHINE_START(model3_15)
- MDRV_MACHINE_RESET(model3_15)
+ MCFG_MACHINE_START(model3_15)
+ MCFG_MACHINE_RESET(model3_15)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_NVRAM_ADD_1FILL("backup")
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_ADD_1FILL("backup")
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VISIBLE_AREA(0, 495, 0, 383)
- MDRV_SCREEN_SIZE(496, 400)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 383)
+ MCFG_SCREEN_SIZE(496, 400)
- MDRV_PALETTE_LENGTH(32768)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_VIDEO_START(model3)
- MDRV_VIDEO_UPDATE(model3)
+ MCFG_VIDEO_START(model3)
+ MCFG_VIDEO_UPDATE(model3)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("scsp1", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("scsp1", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
- MDRV_SOUND_ADD("scsp2", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp2_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SOUND_ADD("scsp2", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp2_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( model3_20, driver_device )
- MDRV_CPU_ADD("maincpu", PPC603R, 166000000)
- MDRV_CPU_CONFIG(model3_2x)
- MDRV_CPU_PROGRAM_MAP(model3_mem)
- MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
+ MCFG_CPU_ADD("maincpu", PPC603R, 166000000)
+ MCFG_CPU_CONFIG(model3_2x)
+ MCFG_CPU_PROGRAM_MAP(model3_mem)
+ MCFG_CPU_VBLANK_INT_HACK(model3_interrupt,2)
- MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model3_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(model3_snd)
- MDRV_MACHINE_START(model3_20)
- MDRV_MACHINE_RESET(model3_20)
+ MCFG_MACHINE_START(model3_20)
+ MCFG_MACHINE_RESET(model3_20)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_NVRAM_ADD_1FILL("backup")
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_ADD_1FILL("backup")
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VISIBLE_AREA(0, 495, 0, 383)
- MDRV_SCREEN_SIZE(496, 400)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 383)
+ MCFG_SCREEN_SIZE(496, 400)
- MDRV_PALETTE_LENGTH(32768)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_VIDEO_START(model3)
- MDRV_VIDEO_UPDATE(model3)
+ MCFG_VIDEO_START(model3)
+ MCFG_VIDEO_UPDATE(model3)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("scsp1", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("scsp1", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
- MDRV_SOUND_ADD("scsp2", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp2_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SOUND_ADD("scsp2", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp2_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( model3_21, driver_device )
- MDRV_CPU_ADD("maincpu", PPC603R, 166000000)
- MDRV_CPU_CONFIG(model3_2x)
- MDRV_CPU_PROGRAM_MAP(model3_mem)
- MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
+ MCFG_CPU_ADD("maincpu", PPC603R, 166000000)
+ MCFG_CPU_CONFIG(model3_2x)
+ MCFG_CPU_PROGRAM_MAP(model3_mem)
+ MCFG_CPU_VBLANK_INT_HACK(model3_interrupt,2)
- MDRV_CPU_ADD("audiocpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(model3_snd)
+ MCFG_CPU_ADD("audiocpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(model3_snd)
- MDRV_MACHINE_START(model3_21)
- MDRV_MACHINE_RESET(model3_21)
+ MCFG_MACHINE_START(model3_21)
+ MCFG_MACHINE_RESET(model3_21)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_NVRAM_ADD_1FILL("backup")
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_ADD_1FILL("backup")
- 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_VISIBLE_AREA(0, 495, 0, 383)
- MDRV_SCREEN_SIZE(496, 400)
+ 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_VISIBLE_AREA(0, 495, 0, 383)
+ MCFG_SCREEN_SIZE(496, 400)
- MDRV_PALETTE_LENGTH(32768)
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_VIDEO_START(model3)
- MDRV_VIDEO_UPDATE(model3)
+ MCFG_VIDEO_START(model3)
+ MCFG_VIDEO_UPDATE(model3)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("scsp1", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("scsp1", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
- MDRV_SOUND_ADD("scsp2", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp2_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 2.0)
+ MCFG_SOUND_ADD("scsp2", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp2_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
static void interleave_vroms(running_machine *machine)
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 111694ad7b3..47b4bde5bb4 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -202,37 +202,37 @@ static MACHINE_START( mogura )
static MACHINE_CONFIG_START( mogura, mogura_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,3000000) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(mogura_map)
- MDRV_CPU_IO_MAP(mogura_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,3000000) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(mogura_map)
+ MCFG_CPU_IO_MAP(mogura_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(mogura)
+ MCFG_MACHINE_START(mogura)
- MDRV_GFXDECODE(mogura)
+ MCFG_GFXDECODE(mogura)
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(mogura)
- MDRV_VIDEO_START(mogura)
- MDRV_VIDEO_UPDATE(mogura)
+ MCFG_PALETTE_INIT(mogura)
+ MCFG_VIDEO_START(mogura)
+ MCFG_VIDEO_UPDATE(mogura)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
ROM_START( mogura )
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index 0305579ea89..581359a90b9 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -317,33 +317,33 @@ static MACHINE_RESET( mole )
static MACHINE_CONFIG_START( mole, mole_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 4000000) // ???
- MDRV_CPU_PROGRAM_MAP(mole_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6502, 4000000) // ???
+ MCFG_CPU_PROGRAM_MAP(mole_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(mole)
- MDRV_MACHINE_RESET(mole)
+ MCFG_MACHINE_START(mole)
+ MCFG_MACHINE_RESET(mole)
/* 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(40*8, 25*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 25*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(40*8, 25*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 25*8-1)
- MDRV_GFXDECODE(mole)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_GFXDECODE(mole)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(mole)
- MDRV_VIDEO_START(mole)
- MDRV_VIDEO_UPDATE(mole)
+ MCFG_PALETTE_INIT(mole)
+ MCFG_VIDEO_START(mole)
+ MCFG_VIDEO_UPDATE(mole)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index 6479c4cb8c1..839cc1d59c3 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -263,44 +263,44 @@ static MACHINE_RESET( momoko )
static MACHINE_CONFIG_START( momoko, momoko_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5.0MHz */
- MDRV_CPU_PROGRAM_MAP(momoko_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.0MHz */
+ MCFG_CPU_PROGRAM_MAP(momoko_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 2500000) /* 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(momoko_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 2500000) /* 2.5MHz */
+ MCFG_CPU_PROGRAM_MAP(momoko_sound_map)
- MDRV_MACHINE_START(momoko)
- MDRV_MACHINE_RESET(momoko)
+ MCFG_MACHINE_START(momoko)
+ MCFG_MACHINE_RESET(momoko)
/* 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(1*8, 31*8-1, 2*8, 29*8-1)
+ 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(1*8, 31*8-1, 2*8, 29*8-1)
- MDRV_GFXDECODE(momoko)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(momoko)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_UPDATE(momoko)
+ MCFG_VIDEO_UPDATE(momoko)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 1250000)
- 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.40)
-
- MDRV_SOUND_ADD("ym2", YM2203, 1250000)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.40)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 1250000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 1250000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
MACHINE_CONFIG_END
/****************************************************************************/
diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c
index 30fa202e33e..6cf322ca76d 100644
--- a/src/mame/drivers/monzagp.c
+++ b/src/mame/drivers/monzagp.c
@@ -239,25 +239,25 @@ static GFXDECODE_START( monzagp )
GFXDECODE_END
static MACHINE_CONFIG_START( monzagp, driver_device )
- MDRV_CPU_ADD("maincpu", I8035, 12000000/32) /* 400KHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(monzagp_map)
- MDRV_CPU_IO_MAP(monzagp_io)
- MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", I8035, 12000000/32) /* 400KHz ??? - Main board Crystal is 12MHz */
+ MCFG_CPU_PROGRAM_MAP(monzagp_map)
+ MCFG_CPU_IO_MAP(monzagp_io)
+ 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
-
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(monzagp)
-
- MDRV_GFXDECODE(monzagp)
- MDRV_VIDEO_START(monzagp)
- MDRV_VIDEO_UPDATE(monzagp)
+ 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(0*8, 32*8-1, 0*8, 32*8-1)
+
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_INIT(monzagp)
+
+ MCFG_GFXDECODE(monzagp)
+ MCFG_VIDEO_START(monzagp)
+ MCFG_VIDEO_UPDATE(monzagp)
MACHINE_CONFIG_END
ROM_START( monzagp )
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 3c27f273c98..5e56baf92f7 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -510,102 +510,102 @@ static const k054338_interface moo_k054338_intf =
static MACHINE_CONFIG_START( moo, moo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(moo_map)
- MDRV_CPU_VBLANK_INT("screen", moo_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(moo_map)
+ MCFG_CPU_VBLANK_INT("screen", moo_interrupt)
- MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(moo)
- MDRV_MACHINE_RESET(moo)
+ MCFG_MACHINE_START(moo)
+ MCFG_MACHINE_RESET(moo)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1200)) // should give IRQ4 sufficient time to update scroll registers
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1200)) // should give IRQ4 sufficient time to update scroll registers
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(moo)
- MDRV_VIDEO_UPDATE(moo)
+ MCFG_VIDEO_START(moo)
+ MCFG_VIDEO_UPDATE(moo)
- MDRV_K053247_ADD("k053246", moo_k053247_intf)
- MDRV_K056832_ADD("k056832", moo_k056832_intf)
- MDRV_K053251_ADD("k053251")
- MDRV_K054338_ADD("k054338", moo_k054338_intf)
+ MCFG_K053247_ADD("k053246", moo_k053247_intf)
+ MCFG_K056832_ADD("k056832", moo_k056832_intf)
+ MCFG_K053251_ADD("k053251")
+ MCFG_K054338_ADD("k054338", moo_k054338_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("k054539", K054539, 48000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("k054539", K054539, 48000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( moobl, moo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16100000)
- MDRV_CPU_PROGRAM_MAP(moobl_map)
- MDRV_CPU_VBLANK_INT("screen", moobl_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16100000)
+ MCFG_CPU_PROGRAM_MAP(moobl_map)
+ MCFG_CPU_VBLANK_INT("screen", moobl_interrupt)
- MDRV_MACHINE_START(moo)
- MDRV_MACHINE_RESET(moo)
+ MCFG_MACHINE_START(moo)
+ MCFG_MACHINE_RESET(moo)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1200)) // should give IRQ4 sufficient time to update scroll registers
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1200)) // should give IRQ4 sufficient time to update scroll registers
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(moo)
- MDRV_VIDEO_UPDATE(moo)
+ MCFG_VIDEO_START(moo)
+ MCFG_VIDEO_UPDATE(moo)
- MDRV_K053247_ADD("k053246", moo_k053247_intf)
- MDRV_K056832_ADD("k056832", moo_k056832_intf)
- MDRV_K053251_ADD("k053251")
- MDRV_K054338_ADD("k054338", moo_k054338_intf)
+ MCFG_K053247_ADD("k053246", moo_k053247_intf)
+ MCFG_K056832_ADD("k056832", moo_k056832_intf)
+ MCFG_K053251_ADD("k053251")
+ MCFG_K054338_ADD("k054338", moo_k054338_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1056000, 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("oki", 1056000, 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
static MACHINE_CONFIG_DERIVED( bucky, moo )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bucky_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bucky_map)
- MDRV_K054000_ADD("k054000")
+ MCFG_K054000_ADD("k054000")
- MDRV_DEVICE_REMOVE("k053246")
- MDRV_K053247_ADD("k053246", bucky_k053247_intf) // diff x offset
+ MCFG_DEVICE_REMOVE("k053246")
+ MCFG_K053247_ADD("k053246", bucky_k053247_intf) // diff x offset
/* video hardware */
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_LENGTH(4096)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 903308e33ca..9dbeacadcee 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -270,40 +270,40 @@ static MACHINE_RESET( mosaic )
static MACHINE_CONFIG_START( mosaic, mosaic_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, 7000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mosaic_map)
- MDRV_CPU_IO_MAP(mosaic_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z180, 7000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(mosaic_map)
+ MCFG_CPU_IO_MAP(mosaic_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(mosaic)
- MDRV_MACHINE_RESET(mosaic)
+ MCFG_MACHINE_START(mosaic)
+ MCFG_MACHINE_RESET(mosaic)
/* 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(8*8, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mosaic)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(mosaic)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(mosaic)
- MDRV_VIDEO_UPDATE(mosaic)
+ MCFG_VIDEO_START(mosaic)
+ MCFG_VIDEO_UPDATE(mosaic)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gfire2, mosaic )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gfire2_map)
- MDRV_CPU_IO_MAP(gfire2_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gfire2_map)
+ MCFG_CPU_IO_MAP(gfire2_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 8910f4a03f9..13bd0bc4a75 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -193,40 +193,40 @@ static MACHINE_RESET( mouser )
static MACHINE_CONFIG_START( mouser, mouser_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mouser_map)
- MDRV_CPU_VBLANK_INT("screen", mouser_nmi_interrupt) /* NMI is masked externally */
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(mouser_map)
+ MCFG_CPU_VBLANK_INT("screen", mouser_nmi_interrupt) /* NMI is masked externally */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mouser_sound_map)
- MDRV_CPU_IO_MAP(mouser_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? This controls the sound tempo */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(mouser_sound_map)
+ MCFG_CPU_IO_MAP(mouser_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? This controls the sound tempo */
- MDRV_MACHINE_START(mouser)
- MDRV_MACHINE_RESET(mouser)
+ MCFG_MACHINE_START(mouser)
+ MCFG_MACHINE_RESET(mouser)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mouser)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(mouser)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(mouser)
- MDRV_VIDEO_UPDATE(mouser)
+ MCFG_PALETTE_INIT(mouser)
+ MCFG_VIDEO_UPDATE(mouser)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 4000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, 4000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 4000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 4000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c
index f17503ce9a6..f33d12df2d8 100644
--- a/src/mame/drivers/mpoker.c
+++ b/src/mame/drivers/mpoker.c
@@ -562,31 +562,31 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mpoker, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* 3 MHz? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* 3 MHz? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-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-1)
- MDRV_GFXDECODE(mpoker)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(mpoker)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(mpoker)
- MDRV_VIDEO_START(mpoker)
- MDRV_VIDEO_UPDATE(mpoker)
+ MCFG_PALETTE_INIT(mpoker)
+ MCFG_VIDEO_START(mpoker)
+ MCFG_VIDEO_UPDATE(mpoker)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("dac", DAC, 0)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MCFG_SPEAKER_STANDARD_MONO("mono")
+// MCFG_SOUND_ADD("dac", DAC, 0)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
ROM_START( mpoker )
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 2180a929c2b..df18ffefdcd 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -1859,61 +1859,61 @@ static const ay8910_interface ay8910_config =
/* machine driver for MOD 2 board */
static MACHINE_CONFIG_START( mpu4mod2, driver_device )
- MDRV_MACHINE_START(mpu4mod2)
- MDRV_MACHINE_RESET(mpu4)
- MDRV_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(mod2_memmap)
+ MCFG_MACHINE_START(mpu4mod2)
+ MCFG_MACHINE_RESET(mpu4)
+ MCFG_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(mod2_memmap)
- MDRV_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
+ MCFG_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
/* 6840 PTM */
- MDRV_PTM6840_ADD("6840ptm", ptm_ic2_intf)
+ MCFG_PTM6840_ADD("6840ptm", ptm_ic2_intf)
- MDRV_PIA6821_ADD("pia_ic3", pia_ic3_intf)
- MDRV_PIA6821_ADD("pia_ic4", pia_ic4_intf)
- MDRV_PIA6821_ADD("pia_ic5", pia_ic5_intf)
- MDRV_PIA6821_ADD("pia_ic6", pia_ic6_intf)
- MDRV_PIA6821_ADD("pia_ic7", pia_ic7_intf)
- MDRV_PIA6821_ADD("pia_ic8", pia_ic8_intf)
+ MCFG_PIA6821_ADD("pia_ic3", pia_ic3_intf)
+ MCFG_PIA6821_ADD("pia_ic4", pia_ic4_intf)
+ MCFG_PIA6821_ADD("pia_ic5", pia_ic5_intf)
+ MCFG_PIA6821_ADD("pia_ic6", pia_ic6_intf)
+ MCFG_PIA6821_ADD("pia_ic7", pia_ic7_intf)
+ MCFG_PIA6821_ADD("pia_ic8", pia_ic8_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8913",AY8913, MPU4_MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay8913",AY8913, MPU4_MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_DEFAULT_LAYOUT(layout_mpu4)
+ MCFG_DEFAULT_LAYOUT(layout_mpu4)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mod4yam, mpu4mod2 )
- MDRV_MACHINE_START(mpu4mod4)
+ MCFG_MACHINE_START(mpu4mod4)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mod4_yam_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mod4_yam_map)
- MDRV_DEVICE_REMOVE("ay8913")
- MDRV_SOUND_ADD("ym2413", YM2413, MPU4_MASTER_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_DEVICE_REMOVE("ay8913")
+ MCFG_SOUND_ADD("ym2413", YM2413, MPU4_MASTER_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mod4oki, mpu4mod2 )
- MDRV_MACHINE_START(mpu4mod4)
+ MCFG_MACHINE_START(mpu4mod4)
- MDRV_PIA6821_ADD("pia_gamebd", pia_gameboard_intf)
+ MCFG_PIA6821_ADD("pia_gamebd", pia_gameboard_intf)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mod4_oki_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mod4_oki_map)
- MDRV_DEVICE_REMOVE("ay8913")
- MDRV_SOUND_ADD("msm6376", OKIM6376, 4000000) //?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_DEVICE_REMOVE("ay8913")
+ MCFG_SOUND_ADD("msm6376", OKIM6376, 4000000) //?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mpu4dutch, mod4oki )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dutch_memmap) // setup read and write memorymap
- MDRV_MACHINE_START(mpu4dutch) // main mpu4 board initialisation
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dutch_memmap) // setup read and write memorymap
+ MCFG_MACHINE_START(mpu4dutch) // main mpu4 board initialisation
MACHINE_CONFIG_END
static DRIVER_INIT (connect4)
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 92365eb12d7..95ac873884a 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -2232,117 +2232,117 @@ static TIMER_DEVICE_CALLBACK( scanline_timer_callback )
static MACHINE_CONFIG_START( mpu4_vid, driver_device )
- MDRV_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4 )
- MDRV_CPU_PROGRAM_MAP(mpu4_6809_map)
- MDRV_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
+ MCFG_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4 )
+ MCFG_CPU_PROGRAM_MAP(mpu4_6809_map)
+ MCFG_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
- MDRV_NVRAM_ADD_0FILL("nvram") /* confirm */
+ MCFG_NVRAM_ADD_0FILL("nvram") /* confirm */
/* 6840 PTM */
- MDRV_PTM6840_ADD("6840ptm", ptm_ic2_intf)
+ MCFG_PTM6840_ADD("6840ptm", ptm_ic2_intf)
- MDRV_PIA6821_ADD("pia_ic3", pia_ic3_intf)
- MDRV_PIA6821_ADD("pia_ic4", pia_ic4_intf)
- MDRV_PIA6821_ADD("pia_ic5", pia_ic5_intf)
- MDRV_PIA6821_ADD("pia_ic6", pia_ic6_intf)
- MDRV_PIA6821_ADD("pia_ic7", pia_ic7_intf)
- MDRV_PIA6821_ADD("pia_ic8", pia_ic8_intf)
+ MCFG_PIA6821_ADD("pia_ic3", pia_ic3_intf)
+ MCFG_PIA6821_ADD("pia_ic4", pia_ic4_intf)
+ MCFG_PIA6821_ADD("pia_ic5", pia_ic5_intf)
+ MCFG_PIA6821_ADD("pia_ic6", pia_ic6_intf)
+ MCFG_PIA6821_ADD("pia_ic7", pia_ic7_intf)
+ MCFG_PIA6821_ADD("pia_ic8", pia_ic8_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 40*8) // note this directly affects the scanline counters used below, and thus the timing of everything
- MDRV_SCREEN_VISIBLE_AREA(0*8, 63*8-1, 0*8, 37*8-1)
- MDRV_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 40*8) // note this directly affects the scanline counters used below, and thus the timing of everything
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 63*8-1, 0*8, 37*8-1)
+ MCFG_SCREEN_REFRESH_RATE(50)
- MDRV_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK )
- MDRV_CPU_PROGRAM_MAP(mpu4_68k_map)
+ MCFG_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK )
+ MCFG_CPU_PROGRAM_MAP(mpu4_68k_map)
- MDRV_QUANTUM_TIME(HZ(960))
+ MCFG_QUANTUM_TIME(HZ(960))
- MDRV_MACHINE_START(mpu4_vid)
- MDRV_MACHINE_RESET(mpu4_vid)
- MDRV_VIDEO_START (mpu4_vid)
- MDRV_VIDEO_UPDATE(mpu4_vid)
+ MCFG_MACHINE_START(mpu4_vid)
+ MCFG_MACHINE_RESET(mpu4_vid)
+ MCFG_VIDEO_START (mpu4_vid)
+ MCFG_VIDEO_UPDATE(mpu4_vid)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_PTM6840_ADD("6840ptm_68k", ptm_vid_intf)
+ MCFG_PTM6840_ADD("6840ptm_68k", ptm_vid_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8913",AY8913, MPU4_MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay8913",AY8913, MPU4_MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* Present on all video cards */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("saa", SAA1099, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.5)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.5)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("saa", SAA1099, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MDRV_ACIA6850_ADD("acia6850_0", m6809_acia_if)
- MDRV_ACIA6850_ADD("acia6850_1", m68k_acia_if)
+ MCFG_ACIA6850_ADD("acia6850_0", m6809_acia_if)
+ MCFG_ACIA6850_ADD("acia6850_1", m68k_acia_if)
// for the video timing
- MDRV_TIMER_ADD_SCANLINE("scan_timer", scanline_timer_callback, "screen", 0, 1)
+ MCFG_TIMER_ADD_SCANLINE("scan_timer", scanline_timer_callback, "screen", 0, 1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( crmaze, mpu4_vid )
- MDRV_PIA6821_MODIFY("pia_ic5", pia_ic5t_intf)
+ MCFG_PIA6821_MODIFY("pia_ic5", pia_ic5t_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mating, crmaze )
- MDRV_SOUND_ADD("oki", OKIM6376, 64000) //?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("oki", OKIM6376, 64000) //?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vgpoker, mpu4_vid )
- MDRV_CPU_MODIFY("video")
- MDRV_CPU_PROGRAM_MAP(vp_68k_map)
+ MCFG_CPU_MODIFY("video")
+ MCFG_CPU_PROGRAM_MAP(vp_68k_map)
MACHINE_CONFIG_END
/* machine driver for Zenitone Deal 'Em board */
static MACHINE_CONFIG_START( dealem, driver_device )
- MDRV_MACHINE_START(mpu4mod2) /* main mpu4 board initialisation */
- MDRV_MACHINE_RESET(mpu4_vid)
- MDRV_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(dealem_memmap)
+ MCFG_MACHINE_START(mpu4mod2) /* main mpu4 board initialisation */
+ MCFG_MACHINE_RESET(mpu4_vid)
+ MCFG_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(dealem_memmap)
- MDRV_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
+ MCFG_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100))
- MDRV_PTM6840_ADD("6840ptm", ptm_ic2_intf)
+ MCFG_PTM6840_ADD("6840ptm", ptm_ic2_intf)
- MDRV_PIA6821_ADD("pia_ic3", pia_ic3_intf)
- MDRV_PIA6821_ADD("pia_ic4", pia_ic4_intf)
- MDRV_PIA6821_ADD("pia_ic5", pia_ic5_intf)
- MDRV_PIA6821_ADD("pia_ic6", pia_ic6_intf)
- MDRV_PIA6821_ADD("pia_ic7", pia_ic7_intf)
- MDRV_PIA6821_ADD("pia_ic8", pia_ic8_intf)
+ MCFG_PIA6821_ADD("pia_ic3", pia_ic3_intf)
+ MCFG_PIA6821_ADD("pia_ic4", pia_ic4_intf)
+ MCFG_PIA6821_ADD("pia_ic5", pia_ic5_intf)
+ MCFG_PIA6821_ADD("pia_ic6", pia_ic6_intf)
+ MCFG_PIA6821_ADD("pia_ic7", pia_ic7_intf)
+ MCFG_PIA6821_ADD("pia_ic8", pia_ic8_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8913",AY8913, MPU4_MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay8913",AY8913, MPU4_MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE((54+1)*8, (32+1)*8) /* Taken from 6845 init, registers 00 & 04. Normally programmed with (value-1) */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 31*8-1) /* Taken from 6845 init, registers 01 & 06 */
- MDRV_SCREEN_REFRESH_RATE(56) /* Measured accurately from the flip-flop, but 6845 handles this */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE((54+1)*8, (32+1)*8) /* Taken from 6845 init, registers 00 & 04. Normally programmed with (value-1) */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 31*8-1) /* Taken from 6845 init, registers 01 & 06 */
+ MCFG_SCREEN_REFRESH_RATE(56) /* Measured accurately from the flip-flop, but 6845 handles this */
- MDRV_GFXDECODE(dealem)
- MDRV_VIDEO_UPDATE(dealem)
+ MCFG_GFXDECODE(dealem)
+ MCFG_VIDEO_UPDATE(dealem)
- MDRV_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(dealem)
+ MCFG_PALETTE_LENGTH(32)
+ MCFG_PALETTE_INIT(dealem)
- MDRV_MC6845_ADD("crtc", HD6845, MPU4_MASTER_CLOCK / 4 / 8, hd6845_intf) /* HD68B45 */
+ MCFG_MC6845_ADD("crtc", HD6845, MPU4_MASTER_CLOCK / 4 / 8, hd6845_intf) /* HD68B45 */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c
index bf246fe6d42..ac4d7c74aa7 100644
--- a/src/mame/drivers/mpu5.c
+++ b/src/mame/drivers/mpu5.c
@@ -34,23 +34,23 @@ static VIDEO_UPDATE(mpu5)
}
static MACHINE_CONFIG_START( mpu5, driver_device )
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000) // ?
- MDRV_CPU_PROGRAM_MAP(mpu5_map)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) // ?
+ MCFG_CPU_PROGRAM_MAP(mpu5_map)
/* actually non-video? */
- 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(8*8, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(mpu5)
- MDRV_VIDEO_UPDATE(mpu5)
+ MCFG_VIDEO_START(mpu5)
+ MCFG_VIDEO_UPDATE(mpu5)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
/* unknown sound */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 9a86c7f2894..229e14fa697 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -360,47 +360,47 @@ static const mos6526_interface cia_1_intf =
static MACHINE_CONFIG_START( mquake, amiga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_RESET(mquake)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(mquake)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.997)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512*2, 262)
- MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.997)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512*2, 262)
+ MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(amiga)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_INIT(amiga)
- MDRV_VIDEO_START(amiga)
- MDRV_VIDEO_UPDATE(amiga)
+ MCFG_VIDEO_START(amiga)
+ MCFG_VIDEO_UPDATE(amiga)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("amiga", AMIGA, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("amiga", AMIGA, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
- MDRV_SOUND_ADD("ensoniq", ES5503, 7159090) /* ES5503 is likely mono due to channel strobe used as bank select */
- MDRV_SOUND_CONFIG(es5503_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ensoniq", ES5503, 7159090) /* ES5503 is likely mono due to channel strobe used as bank select */
+ MCFG_SOUND_CONFIG(es5503_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
/* cia */
- MDRV_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
- MDRV_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
+ MCFG_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
+ MCFG_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index c8cf78bc763..fdcb34fbe97 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -168,30 +168,30 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mrdo, mrdo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2) /* Verified */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2) /* Verified */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/4, 312, 8, 248, 262, 32, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/4, 312, 8, 248, 262, 32, 224)
- MDRV_GFXDECODE(mrdo)
- MDRV_PALETTE_LENGTH(64*4+16*4)
+ MCFG_GFXDECODE(mrdo)
+ MCFG_PALETTE_LENGTH(64*4+16*4)
- MDRV_PALETTE_INIT(mrdo)
- MDRV_VIDEO_START(mrdo)
- MDRV_VIDEO_UPDATE(mrdo)
+ MCFG_PALETTE_INIT(mrdo)
+ MCFG_VIDEO_START(mrdo)
+ MCFG_VIDEO_UPDATE(mrdo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, MAIN_CLOCK/2) /* Verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76489, MAIN_CLOCK/2) /* Verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76489, MAIN_CLOCK/2) /* Verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76489, MAIN_CLOCK/2) /* Verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 90ae5165b8c..aec86e7c337 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -360,47 +360,47 @@ static MACHINE_RESET( mrflea )
static MACHINE_CONFIG_START( mrflea, mrflea_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(mrflea_master_map)
- MDRV_CPU_IO_MAP(mrflea_master_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI resets the game */
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(mrflea_master_map)
+ MCFG_CPU_IO_MAP(mrflea_master_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI resets the game */
- MDRV_CPU_ADD("sub", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(mrflea_slave_map)
- MDRV_CPU_IO_MAP(mrflea_slave_io_map)
- MDRV_CPU_VBLANK_INT_HACK(mrflea_slave_interrupt,2)
+ MCFG_CPU_ADD("sub", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(mrflea_slave_map)
+ MCFG_CPU_IO_MAP(mrflea_slave_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(mrflea_slave_interrupt,2)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(mrflea)
- MDRV_MACHINE_RESET(mrflea)
+ MCFG_MACHINE_START(mrflea)
+ MCFG_MACHINE_RESET(mrflea)
/* 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, 0*8, 31*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, 32*8-1, 0*8, 31*8-1)
- MDRV_GFXDECODE(mrflea)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(mrflea)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_VIDEO_UPDATE(mrflea)
+ MCFG_VIDEO_UPDATE(mrflea)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 2000000)
- MDRV_SOUND_CONFIG(mrflea_ay8910_interface_0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(mrflea_ay8910_interface_0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 2000000)
- MDRV_SOUND_CONFIG(mrflea_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(mrflea_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay3", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay3", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index 66302d0395b..1f7a6bb4ba4 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -181,34 +181,34 @@ GFXDECODE_END
static MACHINE_CONFIG_START( mrjong, mrjong_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,15468000/6) /* 2.578 MHz?? */
- MDRV_CPU_PROGRAM_MAP(mrjong_map)
- MDRV_CPU_IO_MAP(mrjong_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,15468000/6) /* 2.578 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(mrjong_map)
+ MCFG_CPU_IO_MAP(mrjong_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 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, 30*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, 30*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(mrjong)
- MDRV_PALETTE_LENGTH(4*32)
+ MCFG_GFXDECODE(mrjong)
+ MCFG_PALETTE_LENGTH(4*32)
- MDRV_PALETTE_INIT(mrjong)
- MDRV_VIDEO_START(mrjong)
- MDRV_VIDEO_UPDATE(mrjong)
+ MCFG_PALETTE_INIT(mrjong)
+ MCFG_VIDEO_START(mrjong)
+ MCFG_VIDEO_UPDATE(mrjong)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, 15468000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76489, 15468000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76489, 15468000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76489, 15468000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 446fc149b48..8b953d40cdc 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -1315,47 +1315,47 @@ static MACHINE_RESET( ms32 )
static MACHINE_CONFIG_START( ms32, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V70, 20000000) // 20MHz
- MDRV_CPU_PROGRAM_MAP(ms32_map)
- MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32)
+ MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz
+ MCFG_CPU_PROGRAM_MAP(ms32_map)
+ MCFG_CPU_VBLANK_INT_HACK(ms32_interrupt,32)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(ms32_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(ms32_sound_map)
- MDRV_QUANTUM_TIME(HZ(60000))
+ MCFG_QUANTUM_TIME(HZ(60000))
- MDRV_MACHINE_RESET(ms32)
+ MCFG_MACHINE_RESET(ms32)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(40*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*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_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(ms32)
- MDRV_PALETTE_LENGTH(0x10000)
+ MCFG_GFXDECODE(ms32)
+ MCFG_PALETTE_LENGTH(0x10000)
- MDRV_VIDEO_START(ms32)
- MDRV_VIDEO_UPDATE(ms32)
+ MCFG_VIDEO_START(ms32)
+ MCFG_VIDEO_UPDATE(ms32)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF271, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF271, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( f1superb, ms32 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(f1superb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(f1superb_map)
- MDRV_GFXDECODE(f1superb)
+ MCFG_GFXDECODE(f1superb)
- MDRV_VIDEO_START(f1superb)
+ MCFG_VIDEO_START(f1superb)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index bf1db7236fe..3196c0be837 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -481,56 +481,56 @@ static MACHINE_RESET( msisaac )
static MACHINE_CONFIG_START( msisaac, msisaac_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(msisaac_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(msisaac_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(msisaac_sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* source of IRQs is unknown */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(msisaac_sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* source of IRQs is unknown */
#ifdef USE_MCU
- MDRV_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(buggychl_mcu_map)
- MDRV_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
+ MCFG_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(buggychl_mcu_map)
+ MCFG_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
#endif
- MDRV_MACHINE_START(msisaac)
- MDRV_MACHINE_RESET(msisaac)
+ MCFG_MACHINE_START(msisaac)
+ MCFG_MACHINE_RESET(msisaac)
/* 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(0, 32*8-1, 1*8, 31*8-1)
+ 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(0, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(msisaac)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(msisaac)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(msisaac)
- MDRV_VIDEO_UPDATE(msisaac)
+ MCFG_VIDEO_START(msisaac)
+ MCFG_VIDEO_UPDATE(msisaac)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ay1", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("ay2", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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("ay1", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 75c715428f3..518ce4c5161 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -410,38 +410,38 @@ static MACHINE_START( mugsmash )
static MACHINE_CONFIG_START( mugsmash, mugsmash_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(mugsmash_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(mugsmash_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* Guess */
- MDRV_CPU_PROGRAM_MAP(mugsmash_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* Guess */
+ MCFG_CPU_PROGRAM_MAP(mugsmash_sound_map)
- MDRV_MACHINE_START(mugsmash)
+ MCFG_MACHINE_START(mugsmash)
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(mugsmash)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_GFXDECODE(mugsmash)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_VIDEO_START(mugsmash)
- MDRV_VIDEO_UPDATE(mugsmash)
+ MCFG_VIDEO_START(mugsmash)
+ MCFG_VIDEO_UPDATE(mugsmash)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.00) /* music */
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) /* music */
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
- MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) /* sound fx */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) /* sound fx */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
ROM_START( mugsmash )
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index 42d56b32d64..998cfc81c11 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -1023,38 +1023,38 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( multfish, multfish_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4)
- MDRV_CPU_PROGRAM_MAP(multfish_map)
- MDRV_CPU_IO_MAP(multfish_portmap)
- MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4)
+ MCFG_CPU_PROGRAM_MAP(multfish_map)
+ MCFG_CPU_IO_MAP(multfish_portmap)
+ MCFG_CPU_VBLANK_INT("screen",irq0_line_hold)
- MDRV_MACHINE_START( multfish )
- MDRV_MACHINE_RESET( multfish )
+ MCFG_MACHINE_START( multfish )
+ MCFG_MACHINE_RESET( multfish )
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(17*16, 1024-16*7-1, 1*16, 32*16-1*16-1)
- MDRV_GFXDECODE(multfish)
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(multfish)
- MDRV_VIDEO_UPDATE(multfish)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 6000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
-
- MDRV_M48T35_ADD( "m48t35" )
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(17*16, 1024-16*7-1, 1*16, 32*16-1*16-1)
+ MCFG_GFXDECODE(multfish)
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(multfish)
+ MCFG_VIDEO_UPDATE(multfish)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 6000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+
+ MCFG_M48T35_ADD( "m48t35" )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rollfr, multfish )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(rollfr_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(rollfr_portmap)
MACHINE_CONFIG_END
static MACHINE_RESET( island2a )
@@ -1068,7 +1068,7 @@ static MACHINE_RESET( island2a )
static MACHINE_CONFIG_DERIVED( island2a, multfish )
/* basic machine hardware */
- MDRV_MACHINE_RESET( island2a )
+ MCFG_MACHINE_RESET( island2a )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index fdf3bab3f7c..bc4f8bcceea 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -1135,57 +1135,57 @@ static MACHINE_START( supergm3 )
static MACHINE_CONFIG_START( multigam, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", N2A03, N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(multigam_map)
+ MCFG_CPU_ADD("maincpu", N2A03, N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(multigam_map)
- MDRV_MACHINE_START( multigam )
- MDRV_MACHINE_RESET( multigam )
+ MCFG_MACHINE_START( multigam )
+ MCFG_MACHINE_RESET( multigam )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(multigam)
- MDRV_PALETTE_LENGTH(8*4*16)
+ MCFG_GFXDECODE(multigam)
+ MCFG_PALETTE_LENGTH(8*4*16)
- MDRV_PALETTE_INIT(multigam)
- MDRV_VIDEO_START(multigam)
- MDRV_VIDEO_UPDATE(multigam)
+ MCFG_PALETTE_INIT(multigam)
+ MCFG_VIDEO_START(multigam)
+ MCFG_VIDEO_UPDATE(multigam)
- MDRV_PPU2C04_ADD("ppu", ppu_interface)
+ MCFG_PPU2C04_ADD("ppu", ppu_interface)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
- MDRV_SOUND_CONFIG(multigam_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(multigam_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- 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
static MACHINE_CONFIG_DERIVED( multigm3, multigam )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(multigm3_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(multigm3_map)
- MDRV_MACHINE_START( multigm3 )
- MDRV_MACHINE_RESET( multigm3 )
+ MCFG_MACHINE_START( multigm3 )
+ MCFG_MACHINE_RESET( multigm3 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( multigmt, multigam )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(multigmt_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(multigmt_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( supergm3, multigam )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(supergm3_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(supergm3_map)
- MDRV_MACHINE_START(supergm3)
+ MCFG_MACHINE_START(supergm3)
MACHINE_CONFIG_END
ROM_START( multigam )
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 05e9473b121..489f83aa6bf 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -331,41 +331,41 @@ static MACHINE_RESET( munchmo )
static MACHINE_CONFIG_START( mnchmobl, munchmo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_15MHz/4) /* ? */
- MDRV_CPU_PROGRAM_MAP(mnchmobl_map)
- MDRV_CPU_VBLANK_INT_HACK(mnchmobl_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_15MHz/4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(mnchmobl_map)
+ MCFG_CPU_VBLANK_INT_HACK(mnchmobl_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_15MHz/4) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT("screen", mnchmobl_sound_irq)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_15MHz/4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT("screen", mnchmobl_sound_irq)
- MDRV_MACHINE_START(munchmo)
- MDRV_MACHINE_RESET(munchmo)
+ MCFG_MACHINE_START(munchmo)
+ MCFG_MACHINE_RESET(munchmo)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256+32+32, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255+32+32,0, 255-16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256+32+32, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255+32+32,0, 255-16)
- MDRV_GFXDECODE(mnchmobl)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(mnchmobl)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(mnchmobl)
- MDRV_VIDEO_START(mnchmobl)
- MDRV_VIDEO_UPDATE(mnchmobl)
+ MCFG_PALETTE_INIT(mnchmobl)
+ MCFG_VIDEO_START(mnchmobl)
+ MCFG_VIDEO_UPDATE(mnchmobl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* AY clock speeds confirmed to match known recording */
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_15MHz/4/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_15MHz/4/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_15MHz/4/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_15MHz/4/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index 73dc4bc9254..068a8cfaf6c 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -209,25 +209,25 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( murogem, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6802,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(murogem_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6802,8000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(murogem_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((39+1)*8, (38+1)*8) // Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1).
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) // Taken from MC6845 init, registers 01 & 06.
+ 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, (38+1)*8) // Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1).
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) // Taken from MC6845 init, registers 01 & 06.
- MDRV_GFXDECODE(murogem)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(murogem)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(murogem)
- MDRV_VIDEO_UPDATE(murogem)
+ MCFG_PALETTE_INIT(murogem)
+ MCFG_VIDEO_UPDATE(murogem)
- MDRV_MC6845_ADD("crtc", MC6845, 750000, mc6845_intf) /* ? MHz */
+ MCFG_MC6845_ADD("crtc", MC6845, 750000, mc6845_intf) /* ? MHz */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c
index c5adac3b058..fec46632936 100644
--- a/src/mame/drivers/murogmbl.c
+++ b/src/mame/drivers/murogmbl.c
@@ -168,29 +168,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( murogmbl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 1000000) /* Z80? */
- MDRV_CPU_PROGRAM_MAP(murogmbl_map)
+ MCFG_CPU_ADD("maincpu", Z80, 1000000) /* Z80? */
+ MCFG_CPU_PROGRAM_MAP(murogmbl_map)
- MDRV_GFXDECODE(murogmbl)
+ MCFG_GFXDECODE(murogmbl)
- MDRV_PALETTE_INIT(murogmbl)
+ MCFG_PALETTE_INIT(murogmbl)
/* video hardware */
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(murogmbl)
- MDRV_VIDEO_UPDATE(murogmbl)
+ MCFG_VIDEO_START(murogmbl)
+ MCFG_VIDEO_UPDATE(murogmbl)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index 406c2b1cc67..5d31b862714 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -198,38 +198,38 @@ static MACHINE_START( mustache )
static MACHINE_CONFIG_START( mustache, mustache_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(memmap)
- MDRV_CPU_VBLANK_INT("screen", assert_irq)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(memmap)
+ MCFG_CPU_VBLANK_INT("screen", assert_irq)
- MDRV_CPU_ADD(CPUTAG_T5182,Z80, T5182_CLOCK)
- MDRV_CPU_PROGRAM_MAP(t5182_map)
- MDRV_CPU_IO_MAP(t5182_io)
+ MCFG_CPU_ADD(CPUTAG_T5182,Z80, T5182_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(t5182_map)
+ MCFG_CPU_IO_MAP(t5182_io)
- MDRV_MACHINE_START(mustache)
+ MCFG_MACHINE_START(mustache)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56.747)
- 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(1*8, 31*8-1, 0, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56.747)
+ 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(1*8, 31*8-1, 0, 31*8-1)
- MDRV_GFXDECODE(mustache)
- MDRV_PALETTE_LENGTH(8*16+16*8)
+ MCFG_GFXDECODE(mustache)
+ MCFG_PALETTE_LENGTH(8*16+16*8)
- MDRV_PALETTE_INIT(mustache)
- MDRV_VIDEO_START(mustache)
- MDRV_VIDEO_UPDATE(mustache)
+ MCFG_PALETTE_INIT(mustache)
+ MCFG_VIDEO_START(mustache)
+ MCFG_VIDEO_UPDATE(mustache)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, YM_CLOCK)
- MDRV_SOUND_CONFIG(t5182_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, YM_CLOCK)
+ MCFG_SOUND_CONFIG(t5182_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( mustache )
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index a6db4c379d8..9121572fbba 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -225,17 +225,17 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START( mw8080bw_root, mw8080bw_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",I8080,MW8080BW_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(mw8080bw)
- MDRV_MACHINE_RESET(mw8080bw)
+ MCFG_CPU_ADD("maincpu",I8080,MW8080BW_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_MACHINE_START(mw8080bw)
+ MCFG_MACHINE_RESET(mw8080bw)
/* video hardware */
- MDRV_VIDEO_UPDATE(mw8080bw)
+ MCFG_VIDEO_UPDATE(mw8080bw)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(MW8080BW_PIXEL_CLOCK, MW8080BW_HTOTAL, MW8080BW_HBEND, MW8080BW_HPIXCOUNT, MW8080BW_VTOTAL, MW8080BW_VBEND, MW8080BW_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(MW8080BW_PIXEL_CLOCK, MW8080BW_HTOTAL, MW8080BW_HBEND, MW8080BW_HPIXCOUNT, MW8080BW_VTOTAL, MW8080BW_VBEND, MW8080BW_VBSTART)
MACHINE_CONFIG_END
@@ -404,15 +404,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( seawolf, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(seawolf_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(seawolf_io_map)
/* there is no watchdog */
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(seawolf_audio)
+ MCFG_FRAGMENT_ADD(seawolf_audio)
MACHINE_CONFIG_END
@@ -505,15 +505,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( gunfight, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(gunfight_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(gunfight_io_map)
/* there is no watchdog */
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(gunfight_audio)
+ MCFG_FRAGMENT_ADD(gunfight_audio)
MACHINE_CONFIG_END
@@ -735,15 +735,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( tornbase, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(tornbase_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(tornbase_io_map)
/* there is no watchdog */
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(tornbase_audio)
+ MCFG_FRAGMENT_ADD(tornbase_audio)
MACHINE_CONFIG_END
@@ -850,15 +850,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( zzzap, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(zzzap_io_map)
- MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_M(1), CAP_U(1)))) /* 1.1s */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(zzzap_io_map)
+ MCFG_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_M(1), CAP_U(1)))) /* 1.1s */
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- /* MDRV_FRAGMENT_ADD(zzzap_audio) */
+ /* MCFG_FRAGMENT_ADD(zzzap_audio) */
MACHINE_CONFIG_END
@@ -963,13 +963,13 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( maze, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(maze_io_map)
- MDRV_MACHINE_START(maze)
- MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(maze_io_map)
+ MCFG_MACHINE_START(maze)
+ MCFG_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
/* audio hardware */
- MDRV_FRAGMENT_ADD(maze_audio)
+ MCFG_FRAGMENT_ADD(maze_audio)
MACHINE_CONFIG_END
@@ -1055,16 +1055,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( boothill, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(boothill_io_map)
- MDRV_MACHINE_START(boothill)
- MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(boothill_io_map)
+ MCFG_MACHINE_START(boothill)
+ MCFG_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(boothill_audio)
+ MCFG_FRAGMENT_ADD(boothill_audio)
MACHINE_CONFIG_END
@@ -1162,12 +1162,12 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( checkmat, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(checkmat_io_map)
- MDRV_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(checkmat_io_map)
+ MCFG_WATCHDOG_TIME_INIT(NSEC(PERIOD_OF_555_MONOSTABLE_NSEC(RES_K(270), CAP_U(10)))) /* 2.97s */
/* audio hardware */
- MDRV_FRAGMENT_ADD(checkmat_audio)
+ MCFG_FRAGMENT_ADD(checkmat_audio)
MACHINE_CONFIG_END
@@ -1291,16 +1291,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( desertgu, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(desertgu_io_map)
- MDRV_MACHINE_START(desertgu)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(desertgu_io_map)
+ MCFG_MACHINE_START(desertgu)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(desertgu_audio)
+ MCFG_FRAGMENT_ADD(desertgu_audio)
MACHINE_CONFIG_END
@@ -1491,15 +1491,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( dplay, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(dplay_io_map)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(dplay_io_map)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(dplay_audio)
+ MCFG_FRAGMENT_ADD(dplay_audio)
MACHINE_CONFIG_END
@@ -1586,16 +1586,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( gmissile, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(gmissile_io_map)
- MDRV_MACHINE_START(gmissile)
- MDRV_WATCHDOG_VBLANK_INIT(255) /* really based on a 60Hz clock source */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(gmissile_io_map)
+ MCFG_MACHINE_START(gmissile)
+ MCFG_WATCHDOG_VBLANK_INIT(255) /* really based on a 60Hz clock source */
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(gmissile_audio)
+ MCFG_FRAGMENT_ADD(gmissile_audio)
MACHINE_CONFIG_END
@@ -1680,16 +1680,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( m4, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(m4_io_map)
- MDRV_MACHINE_START(m4)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(m4_io_map)
+ MCFG_MACHINE_START(m4)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(m4_audio)
+ MCFG_FRAGMENT_ADD(m4_audio)
MACHINE_CONFIG_END
@@ -1850,16 +1850,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( clowns, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(clowns_io_map)
- MDRV_MACHINE_START(clowns)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(clowns_io_map)
+ MCFG_MACHINE_START(clowns)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(clowns_audio)
+ MCFG_FRAGMENT_ADD(clowns_audio)
MACHINE_CONFIG_END
@@ -1944,16 +1944,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( spacwalk, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(spacwalk_io_map)
- MDRV_MACHINE_START(clowns)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(spacwalk_io_map)
+ MCFG_MACHINE_START(clowns)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(spacwalk_audio)
+ MCFG_FRAGMENT_ADD(spacwalk_audio)
MACHINE_CONFIG_END
@@ -2025,15 +2025,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( shuffle, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(shuffle_io_map)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(shuffle_io_map)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(shuffle_audio)
+ MCFG_FRAGMENT_ADD(shuffle_audio)
MACHINE_CONFIG_END
@@ -2110,17 +2110,17 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( dogpatch, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(dogpatch_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(dogpatch_io_map)
/* the watch dog time is unknown, but all other */
/* Midway boards of the era used the same circuit */
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(dogpatch_audio)
+ MCFG_FRAGMENT_ADD(dogpatch_audio)
MACHINE_CONFIG_END
@@ -2275,24 +2275,24 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( spcenctr, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(spcenctr_io_map)
- MDRV_MACHINE_START(spcenctr)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(spcenctr_io_map)
+ MCFG_MACHINE_START(spcenctr)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* timers */
- MDRV_TIMER_ADD_PERIODIC("strobeon", spcenctr_strobe_timer_callback, HZ(SPCENCTR_STROBE_FREQ))
- MDRV_TIMER_PARAM(TRUE) /* indicates strobe ON */
+ MCFG_TIMER_ADD_PERIODIC("strobeon", spcenctr_strobe_timer_callback, HZ(SPCENCTR_STROBE_FREQ))
+ MCFG_TIMER_PARAM(TRUE) /* indicates strobe ON */
- MDRV_TIMER_ADD_PERIODIC("strobeoff", spcenctr_strobe_timer_callback, HZ(SPCENCTR_STROBE_FREQ))
- MDRV_TIMER_START_DELAY(HZ(SPCENCTR_STROBE_FREQ * 100 / SPCENCTR_STROBE_DUTY_CYCLE))
- MDRV_TIMER_PARAM(FALSE) /* indicates strobe OFF */
+ MCFG_TIMER_ADD_PERIODIC("strobeoff", spcenctr_strobe_timer_callback, HZ(SPCENCTR_STROBE_FREQ))
+ MCFG_TIMER_START_DELAY(HZ(SPCENCTR_STROBE_FREQ * 100 / SPCENCTR_STROBE_DUTY_CYCLE))
+ MCFG_TIMER_PARAM(FALSE) /* indicates strobe OFF */
/* video hardware */
- MDRV_VIDEO_UPDATE(spcenctr)
+ MCFG_VIDEO_UPDATE(spcenctr)
/* audio hardware */
- MDRV_FRAGMENT_ADD(spcenctr_audio)
+ MCFG_FRAGMENT_ADD(spcenctr_audio)
MACHINE_CONFIG_END
@@ -2370,20 +2370,20 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( phantom2, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(phantom2_io_map)
- MDRV_MACHINE_START(phantom2)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(phantom2_io_map)
+ MCFG_MACHINE_START(phantom2)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* video hardware */
- MDRV_VIDEO_UPDATE(phantom2)
- MDRV_VIDEO_EOF(phantom2)
+ MCFG_VIDEO_UPDATE(phantom2)
+ MCFG_VIDEO_EOF(phantom2)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(phantom2_audio)
+ MCFG_FRAGMENT_ADD(phantom2_audio)
MACHINE_CONFIG_END
@@ -2509,15 +2509,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( bowler, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(bowler_io_map)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(bowler_io_map)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(bowler_audio)
+ MCFG_FRAGMENT_ADD(bowler_audio)
MACHINE_CONFIG_END
@@ -2725,19 +2725,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_DERIVED( invaders, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invaders_io_map)
- MDRV_MACHINE_START(invaders)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(invaders_io_map)
+ MCFG_MACHINE_START(invaders)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* video hardware */
- 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
@@ -2807,15 +2807,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( blueshrk, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(blueshrk_io_map)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(blueshrk_io_map)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(blueshrk_audio)
+ MCFG_FRAGMENT_ADD(blueshrk_audio)
MACHINE_CONFIG_END
@@ -2907,15 +2907,15 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( invad2ct, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invad2ct_io_map)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(invad2ct_io_map)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(invad2ct_audio)
+ MCFG_FRAGMENT_ADD(invad2ct_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index 1badae14ae8..a259eec17ed 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -535,35 +535,35 @@ static MACHINE_RESET( mwarr )
static MACHINE_CONFIG_START( mwarr, mwarr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(mwarr_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(mwarr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(mwarr)
- MDRV_MACHINE_RESET(mwarr)
+ MCFG_MACHINE_START(mwarr)
+ MCFG_MACHINE_RESET(mwarr)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- 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(8+1, 48*8-1-8-1, 0, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ 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(8+1, 48*8-1-8-1, 0, 30*8-1)
- MDRV_GFXDECODE(mwarr)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(mwarr)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(mwarr)
- MDRV_VIDEO_UPDATE(mwarr)
+ MCFG_VIDEO_START(mwarr)
+ MCFG_VIDEO_UPDATE(mwarr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", SOUND_CLOCK/48 , OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", SOUND_CLOCK/48 , OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", SOUND_CLOCK/48 , OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki2", SOUND_CLOCK/48 , OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index 2f4e98ac1cc..4ab807fdd49 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -204,20 +204,20 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( mystston, mystston_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
/* video hardware */
- MDRV_FRAGMENT_ADD(mystston_video)
+ MCFG_FRAGMENT_ADD(mystston_video)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, AY8910_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, AY8910_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, AY8910_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, AY8910_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 9f2d47d67d4..a5eb0a14c59 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -942,154 +942,154 @@ static MACHINE_RESET(gaiapols)
static MACHINE_CONFIG_START( mystwarr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz (confirmed) */
- MDRV_CPU_PROGRAM_MAP(mystwarr_map)
- MDRV_CPU_VBLANK_INT_HACK(mystwarr_interrupt, 3)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz (confirmed) */
+ MCFG_CPU_PROGRAM_MAP(mystwarr_map)
+ MCFG_CPU_VBLANK_INT_HACK(mystwarr_interrupt, 3)
- MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(mystwarr_sound_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 480)
+ MCFG_CPU_ADD("soundcpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(mystwarr_sound_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 480)
- MDRV_QUANTUM_TIME(HZ(1920))
+ MCFG_QUANTUM_TIME(HZ(1920))
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_MACHINE_START(mystwarr)
- MDRV_MACHINE_RESET(mystwarr)
+ MCFG_MACHINE_START(mystwarr)
+ MCFG_MACHINE_RESET(mystwarr)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
-// MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(24, 24+288-1, 16, 16+224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+// MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_RAW_PARAMS(6000000, 288+16+32+48, 0, 287, 224+16+8+16, 0, 223)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(24, 24+288-1, 16, 16+224-1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(mystwarr)
- MDRV_VIDEO_UPDATE(mystwarr)
+ MCFG_VIDEO_START(mystwarr)
+ MCFG_VIDEO_UPDATE(mystwarr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami1", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("konami1", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ADD("konami2", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("konami2", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( viostorm, mystwarr )
- MDRV_MACHINE_RESET(viostorm)
+ MCFG_MACHINE_RESET(viostorm)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(viostorm_map)
- MDRV_CPU_VBLANK_INT_HACK(metamrph_interrupt, 40)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(viostorm_map)
+ MCFG_CPU_VBLANK_INT_HACK(metamrph_interrupt, 40)
/* video hardware */
- MDRV_VIDEO_START(viostorm)
- MDRV_VIDEO_UPDATE(metamrph)
+ MCFG_VIDEO_START(viostorm)
+ MCFG_VIDEO_UPDATE(metamrph)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(900))
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(900))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( metamrph, mystwarr )
- MDRV_MACHINE_RESET(metamrph)
+ MCFG_MACHINE_RESET(metamrph)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(metamrph_map)
- MDRV_CPU_VBLANK_INT_HACK(metamrph_interrupt, 40)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(metamrph_map)
+ MCFG_CPU_VBLANK_INT_HACK(metamrph_interrupt, 40)
/* video hardware */
- MDRV_VIDEO_START(metamrph)
- MDRV_VIDEO_UPDATE(metamrph)
+ MCFG_VIDEO_START(metamrph)
+ MCFG_VIDEO_UPDATE(metamrph)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(900))
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(24, 24+288-1, 17, 17+224-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(900))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(24, 24+288-1, 17, 17+224-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dadandrn, mystwarr )
- MDRV_MACHINE_RESET(dadandrn)
+ MCFG_MACHINE_RESET(dadandrn)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dadandrn_map)
- MDRV_CPU_VBLANK_INT("screen", ddd_interrupt)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dadandrn_map)
+ MCFG_CPU_VBLANK_INT("screen", ddd_interrupt)
- MDRV_GFXDECODE(dadandrn)
+ MCFG_GFXDECODE(dadandrn)
/* video hardware */
- MDRV_VIDEO_START(dadandrn)
- MDRV_VIDEO_UPDATE(dadandrn)
+ MCFG_VIDEO_START(dadandrn)
+ MCFG_VIDEO_UPDATE(dadandrn)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(24, 24+288-1, 17, 17+224-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(24, 24+288-1, 17, 17+224-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gaiapols, mystwarr )
- MDRV_MACHINE_RESET(gaiapols)
+ MCFG_MACHINE_RESET(gaiapols)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gaiapols_map)
- MDRV_CPU_VBLANK_INT("screen", ddd_interrupt)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gaiapols_map)
+ MCFG_CPU_VBLANK_INT("screen", ddd_interrupt)
- MDRV_GFXDECODE(gaiapols)
+ MCFG_GFXDECODE(gaiapols)
- MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_ADD("eeprom", gaia_eeprom_intf)
+ MCFG_DEVICE_REMOVE("eeprom")
+ MCFG_EEPROM_ADD("eeprom", gaia_eeprom_intf)
/* video hardware */
- MDRV_VIDEO_START(gaiapols)
- MDRV_VIDEO_UPDATE(dadandrn)
-
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(8000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(40, 40+376-1, 16, 16+224-1)
+ MCFG_VIDEO_START(gaiapols)
+ MCFG_VIDEO_UPDATE(dadandrn)
+
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(8000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(600))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+376-1, 16, 16+224-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( martchmp, mystwarr )
- MDRV_MACHINE_RESET(martchmp)
+ MCFG_MACHINE_RESET(martchmp)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(martchmp_map)
- MDRV_CPU_VBLANK_INT_HACK(mchamp_interrupt, 2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(martchmp_map)
+ MCFG_CPU_VBLANK_INT_HACK(mchamp_interrupt, 2)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_VIDEO_START(martchmp)
- MDRV_VIDEO_UPDATE(martchmp)
+ MCFG_VIDEO_START(martchmp)
+ MCFG_VIDEO_UPDATE(martchmp)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(32, 32+384-1, 16, 16+224-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(32, 32+384-1, 16, 16+224-1)
MACHINE_CONFIG_END
/**********************************************************************************/
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index ad4f5182298..0eeca20d89d 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -509,94 +509,94 @@ static MACHINE_RESET( helifire )
static MACHINE_CONFIG_START( spacefev, n8080_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
- MDRV_CPU_CONFIG(n8080_cpu_config)
- MDRV_CPU_PROGRAM_MAP(main_cpu_map)
- MDRV_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
+ MCFG_CPU_CONFIG(n8080_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(main_cpu_map)
+ MCFG_CPU_IO_MAP(main_io_map)
- MDRV_MACHINE_START(spacefev)
- MDRV_MACHINE_RESET(spacefev)
+ MCFG_MACHINE_START(spacefev)
+ MCFG_MACHINE_RESET(spacefev)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 16, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 239)
- MDRV_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(n8080)
- MDRV_VIDEO_START(spacefev)
- MDRV_VIDEO_UPDATE(spacefev)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(n8080)
+ MCFG_VIDEO_START(spacefev)
+ MCFG_VIDEO_UPDATE(spacefev)
- MDRV_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256)
- MDRV_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256)
+ MCFG_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256)
+ MCFG_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256)
/* sound hardware */
- MDRV_FRAGMENT_ADD( spacefev_sound )
+ MCFG_FRAGMENT_ADD( spacefev_sound )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sheriff, n8080_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
- MDRV_CPU_CONFIG(n8080_cpu_config)
- MDRV_CPU_PROGRAM_MAP(main_cpu_map)
- MDRV_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
+ MCFG_CPU_CONFIG(n8080_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(main_cpu_map)
+ MCFG_CPU_IO_MAP(main_io_map)
- MDRV_MACHINE_START(sheriff)
- MDRV_MACHINE_RESET(sheriff)
+ MCFG_MACHINE_START(sheriff)
+ MCFG_MACHINE_RESET(sheriff)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 16, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 239)
- MDRV_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(n8080)
- MDRV_VIDEO_START(sheriff)
- MDRV_VIDEO_UPDATE(sheriff)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(n8080)
+ MCFG_VIDEO_START(sheriff)
+ MCFG_VIDEO_UPDATE(sheriff)
- MDRV_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256)
- MDRV_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256)
+ MCFG_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256)
+ MCFG_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256)
/* sound hardware */
- MDRV_FRAGMENT_ADD( sheriff_sound )
+ MCFG_FRAGMENT_ADD( sheriff_sound )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( helifire, n8080_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
- MDRV_CPU_CONFIG(n8080_cpu_config)
- MDRV_CPU_PROGRAM_MAP(helifire_main_cpu_map)
- MDRV_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
+ MCFG_CPU_CONFIG(n8080_cpu_config)
+ MCFG_CPU_PROGRAM_MAP(helifire_main_cpu_map)
+ MCFG_CPU_IO_MAP(main_io_map)
- MDRV_MACHINE_START(helifire)
- MDRV_MACHINE_RESET(helifire)
+ MCFG_MACHINE_START(helifire)
+ MCFG_MACHINE_RESET(helifire)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 16, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 239)
- MDRV_PALETTE_LENGTH(8 + 0x400)
- MDRV_PALETTE_INIT(helifire)
- MDRV_VIDEO_START(helifire)
- MDRV_VIDEO_UPDATE(helifire)
- MDRV_VIDEO_EOF(helifire)
+ MCFG_PALETTE_LENGTH(8 + 0x400)
+ MCFG_PALETTE_INIT(helifire)
+ MCFG_VIDEO_START(helifire)
+ MCFG_VIDEO_UPDATE(helifire)
+ MCFG_VIDEO_EOF(helifire)
- MDRV_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256)
- MDRV_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256)
+ MCFG_TIMER_ADD_SCANLINE("rst1", rst1_tick, "screen", 128, 256)
+ MCFG_TIMER_ADD_SCANLINE("rst2", rst2_tick, "screen", 240, 256)
/* sound hardware */
- MDRV_FRAGMENT_ADD( helifire_sound )
+ MCFG_FRAGMENT_ADD( helifire_sound )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index 821c8bdc550..17bfb6f8e3b 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -588,37 +588,37 @@ static MACHINE_RESET( namcofl )
static MACHINE_CONFIG_START( namcofl, driver_device )
- MDRV_CPU_ADD("maincpu", I960, 20000000) // i80960KA-20 == 20 MHz part
- MDRV_CPU_PROGRAM_MAP(namcofl_mem)
+ MCFG_CPU_ADD("maincpu", I960, 20000000) // i80960KA-20 == 20 MHz part
+ MCFG_CPU_PROGRAM_MAP(namcofl_mem)
- MDRV_CPU_ADD("mcu", M37702, 48384000/3)
- MDRV_CPU_PROGRAM_MAP(namcoc75_am)
- MDRV_CPU_IO_MAP(namcoc75_io)
- MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
+ MCFG_CPU_ADD("mcu", M37702, 48384000/3)
+ MCFG_CPU_PROGRAM_MAP(namcoc75_am)
+ MCFG_CPU_IO_MAP(namcoc75_io)
+ MCFG_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
- MDRV_MACHINE_START(namcofl)
- MDRV_MACHINE_RESET(namcofl)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcofl)
+ MCFG_MACHINE_RESET(namcofl)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL)
- MDRV_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL)
+ MCFG_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_GFXDECODE(2)
+ MCFG_GFXDECODE(2)
- MDRV_VIDEO_START(namcofl)
- MDRV_VIDEO_UPDATE(namcofl)
+ MCFG_VIDEO_START(namcofl)
+ MCFG_VIDEO_UPDATE(namcofl)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, 48384000/3)
- 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, 48384000/3)
+ 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)
MACHINE_CONFIG_END
ROM_START( speedrcr )
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 97b94dc50de..fe17e6ca9f8 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -1006,42 +1006,42 @@ static const c140_interface C140_interface_typeA =
/* cropped at sides */
static MACHINE_CONFIG_START( namcona1, namcona1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 50113000/4)
- MDRV_CPU_PROGRAM_MAP(namcona1_main_map)
- MDRV_CPU_VBLANK_INT_HACK(namcona1_interrupt,5)
+ MCFG_CPU_ADD("maincpu", M68000, 50113000/4)
+ MCFG_CPU_PROGRAM_MAP(namcona1_main_map)
+ MCFG_CPU_VBLANK_INT_HACK(namcona1_interrupt,5)
- MDRV_CPU_ADD("mcu", M37702, 50113000/4)
- MDRV_CPU_PROGRAM_MAP(namcona1_mcu_map)
- MDRV_CPU_IO_MAP( namcona1_mcu_io_map)
- MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 2)
+ MCFG_CPU_ADD("mcu", M37702, 50113000/4)
+ MCFG_CPU_PROGRAM_MAP(namcona1_mcu_map)
+ MCFG_CPU_IO_MAP( namcona1_mcu_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(mcu_interrupt, 2)
- MDRV_NVRAM_HANDLER(namcosna1)
- MDRV_MACHINE_START(namcona1)
- MDRV_MACHINE_RESET(namcona1_mcu)
- MDRV_QUANTUM_TIME(HZ(2400))
+ MCFG_NVRAM_HANDLER(namcosna1)
+ MCFG_MACHINE_START(namcona1)
+ MCFG_MACHINE_RESET(namcona1_mcu)
+ MCFG_QUANTUM_TIME(HZ(2400))
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(38*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8, 38*8-1-8, 4*8, 32*8-1)
+ 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(38*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8, 38*8-1-8, 4*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(namcona1)
- MDRV_VIDEO_UPDATE(namcona1)
+ MCFG_VIDEO_START(namcona1)
+ MCFG_VIDEO_UPDATE(namcona1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, 44100)
- MDRV_SOUND_CONFIG(C140_interface_typeA)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.00)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.00)
+ MCFG_SOUND_ADD("c140", C140, 44100)
+ MCFG_SOUND_CONFIG(C140_interface_typeA)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.00)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.00)
MACHINE_CONFIG_END
@@ -1051,8 +1051,8 @@ static MACHINE_CONFIG_DERIVED( namcona1w, namcona1 )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 38*8-1-0, 4*8, 32*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 38*8-1-0, 4*8, 32*8-1)
MACHINE_CONFIG_END
@@ -1060,8 +1060,8 @@ static MACHINE_CONFIG_DERIVED( namcona2, namcona1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(namcona2_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(namcona2_main_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index 74605a90ff0..c989f2cfc68 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -1012,69 +1012,69 @@ ADDRESS_MAP_END
#define MASTER_CLOCK_HZ 48384000
static MACHINE_CONFIG_START( namconb1, driver_device )
- MDRV_CPU_ADD("maincpu", M68EC020,MASTER_CLOCK_HZ/2)
- MDRV_CPU_PROGRAM_MAP(namconb1_am)
- MDRV_CPU_VBLANK_INT("screen", namconb1_interrupt)
-
- MDRV_CPU_ADD("mcu", M37702, MASTER_CLOCK_HZ/3)
- MDRV_CPU_PROGRAM_MAP(namcoc75_am)
- MDRV_CPU_IO_MAP(namcoc75_io)
- MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
-
- MDRV_NVRAM_HANDLER(namconb1)
- MDRV_MACHINE_START(namconb)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.7)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL)
- MDRV_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1)
-
- MDRV_GFXDECODE(namconb1)
- MDRV_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(namconb1)
- MDRV_VIDEO_UPDATE(namconb1)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, MASTER_CLOCK_HZ/3)
- 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_CPU_ADD("maincpu", M68EC020,MASTER_CLOCK_HZ/2)
+ MCFG_CPU_PROGRAM_MAP(namconb1_am)
+ MCFG_CPU_VBLANK_INT("screen", namconb1_interrupt)
+
+ MCFG_CPU_ADD("mcu", M37702, MASTER_CLOCK_HZ/3)
+ MCFG_CPU_PROGRAM_MAP(namcoc75_am)
+ MCFG_CPU_IO_MAP(namcoc75_io)
+ MCFG_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
+
+ MCFG_NVRAM_HANDLER(namconb1)
+ MCFG_MACHINE_START(namconb)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.7)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL)
+ MCFG_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1)
+
+ MCFG_GFXDECODE(namconb1)
+ MCFG_PALETTE_LENGTH(0x2000)
+ MCFG_VIDEO_START(namconb1)
+ MCFG_VIDEO_UPDATE(namconb1)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("c352", C352, MASTER_CLOCK_HZ/3)
+ 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)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( namconb2, driver_device )
- MDRV_CPU_ADD("maincpu", M68EC020,MASTER_CLOCK_HZ/2)
- MDRV_CPU_PROGRAM_MAP(namconb2_am)
- MDRV_CPU_VBLANK_INT("screen", namconb2_interrupt)
-
- MDRV_CPU_ADD("mcu", M37702, MASTER_CLOCK_HZ/3)
- MDRV_CPU_PROGRAM_MAP(namcoc75_am)
- MDRV_CPU_IO_MAP(namcoc75_io)
- MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
-
- MDRV_NVRAM_HANDLER(namconb1)
- MDRV_MACHINE_START(namconb)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.7)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL)
- MDRV_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1)
-
- MDRV_GFXDECODE(2)
- MDRV_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(namconb2)
- MDRV_VIDEO_UPDATE(namconb2)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, MASTER_CLOCK_HZ/3)
- 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_CPU_ADD("maincpu", M68EC020,MASTER_CLOCK_HZ/2)
+ MCFG_CPU_PROGRAM_MAP(namconb2_am)
+ MCFG_CPU_VBLANK_INT("screen", namconb2_interrupt)
+
+ MCFG_CPU_ADD("mcu", M37702, MASTER_CLOCK_HZ/3)
+ MCFG_CPU_PROGRAM_MAP(namcoc75_am)
+ MCFG_CPU_IO_MAP(namcoc75_io)
+ MCFG_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
+
+ MCFG_NVRAM_HANDLER(namconb1)
+ MCFG_MACHINE_START(namconb)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.7)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(NAMCONB1_HTOTAL, NAMCONB1_VTOTAL)
+ MCFG_SCREEN_VISIBLE_AREA(0, NAMCONB1_HBSTART-1, 0, NAMCONB1_VBSTART-1)
+
+ MCFG_GFXDECODE(2)
+ MCFG_PALETTE_LENGTH(0x2000)
+ MCFG_VIDEO_START(namconb2)
+ MCFG_VIDEO_UPDATE(namconb2)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("c352", C352, MASTER_CLOCK_HZ/3)
+ 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)
MACHINE_CONFIG_END
/***************************************************************/
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index f07b8a168fc..1cc5e42cf3b 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -284,51 +284,51 @@ static INTERRUPT_GEN( mcu_interrupt )
static MACHINE_CONFIG_START( namcond1, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12288000)
- MDRV_CPU_PROGRAM_MAP(namcond1_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12288000)
+ MCFG_CPU_PROGRAM_MAP(namcond1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
// I've disabled this for now, I don't think it's correct, it breaks ncv2 'game options' in test
// mode (and could also be responsible for the random resets?)
// also, if you log the timing of it and the scanlines on which the interrupt fires, it doesn't
// seem correct for the intended purpose?
- //MDRV_CPU_PERIODIC_INT(ygv608_timed_interrupt, 1000)
+ //MCFG_CPU_PERIODIC_INT(ygv608_timed_interrupt, 1000)
- MDRV_CPU_ADD("mcu", H83002, 16384000 )
- MDRV_CPU_PROGRAM_MAP( nd1h8rwmap)
- MDRV_CPU_IO_MAP( nd1h8iomap)
- MDRV_CPU_VBLANK_INT("screen", mcu_interrupt)
+ MCFG_CPU_ADD("mcu", H83002, 16384000 )
+ MCFG_CPU_PROGRAM_MAP( nd1h8rwmap)
+ MCFG_CPU_IO_MAP( nd1h8iomap)
+ MCFG_CPU_VBLANK_INT("screen", mcu_interrupt)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(namcond1)
- MDRV_MACHINE_RESET(namcond1)
+ MCFG_MACHINE_START(namcond1)
+ MCFG_MACHINE_RESET(namcond1)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.0)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(288, 224) // maximum display resolution (512x512 in theory)
- MDRV_SCREEN_VISIBLE_AREA(0, 287, 0, 223) // default visible area
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.0)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(288, 224) // maximum display resolution (512x512 in theory)
+ MCFG_SCREEN_VISIBLE_AREA(0, 287, 0, 223) // default visible area
- MDRV_GFXDECODE(namcond1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(namcond1)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(ygv608)
- MDRV_VIDEO_UPDATE(ygv608)
+ MCFG_VIDEO_START(ygv608)
+ MCFG_VIDEO_UPDATE(ygv608)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, 16384000)
- 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_SOUND_ADD("c352", C352, 16384000)
+ 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)
- MDRV_AT28C16_ADD( "at28c16", NULL )
+ MCFG_AT28C16_ADD( "at28c16", NULL )
MACHINE_CONFIG_END
ROM_START( ncv1 )
diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c
index 4bd74b7004d..73b93c91506 100644
--- a/src/mame/drivers/namcops2.c
+++ b/src/mame/drivers/namcops2.c
@@ -48,21 +48,21 @@ static const mips3_config r5000_config =
};
static MACHINE_CONFIG_START( system246, driver_device )
- MDRV_CPU_ADD("maincpu", R5000LE, 294000000) // actually R5900 @ 294 MHz
- MDRV_CPU_PROGRAM_MAP(ps2_map)
- MDRV_CPU_CONFIG(r5000_config)
+ MCFG_CPU_ADD("maincpu", R5000LE, 294000000) // actually R5900 @ 294 MHz
+ MCFG_CPU_PROGRAM_MAP(ps2_map)
+ MCFG_CPU_CONFIG(r5000_config)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_VIDEO_START(system246)
- MDRV_VIDEO_UPDATE(system246)
+ MCFG_VIDEO_START(system246)
+ MCFG_VIDEO_UPDATE(system246)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system256, system246 )
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index dfb8100360d..3d9d483be98 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -1081,62 +1081,62 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( ns1, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", M6809,49152000/32)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", M6809,49152000/32)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("audiocpu", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("audiocpu", M6809,49152000/32)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("mcu",HD63701,49152000/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
- MDRV_CPU_IO_MAP(mcu_port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("mcu",HD63701,49152000/8)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_IO_MAP(mcu_port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
// heavy sync required to prevent CPUs from fighting for video RAM access and going into deadlocks
- MDRV_QUANTUM_TIME(HZ(38400))
+ MCFG_QUANTUM_TIME(HZ(38400))
- MDRV_MACHINE_RESET(namcos1)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(namcos1)
+ 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.606060)
- 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(9 + 8*8, 9 + 44*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ 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(9 + 8*8, 9 + 44*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(namcos1)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(namcos1)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(namcos1)
- MDRV_VIDEO_UPDATE(namcos1)
- MDRV_VIDEO_EOF(namcos1)
+ MCFG_VIDEO_START(namcos1)
+ MCFG_VIDEO_UPDATE(namcos1)
+ MCFG_VIDEO_EOF(namcos1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579580)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579580)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048/2)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048/2)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ 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/namcos10.c b/src/mame/drivers/namcos10.c
index 574c4d415b9..b67c7117ad4 100644
--- a/src/mame/drivers/namcos10.c
+++ b/src/mame/drivers/namcos10.c
@@ -384,28 +384,28 @@ static MACHINE_RESET( namcos10 )
static MACHINE_CONFIG_START( namcos10, namcos10_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_101_4912MHz )
- MDRV_CPU_PROGRAM_MAP( namcos10_map)
- MDRV_CPU_VBLANK_INT("screen", psx_vblank)
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_101_4912MHz )
+ MCFG_CPU_PROGRAM_MAP( namcos10_map)
+ MCFG_CPU_VBLANK_INT("screen", psx_vblank)
- MDRV_MACHINE_RESET( namcos10 )
+ MCFG_MACHINE_RESET( namcos10 )
/* 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( 1024, 1024 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ 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( 1024, 1024 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type2 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
static INPUT_PORTS_START( namcos10 )
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 24d878aff08..62288401fce 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -994,46 +994,46 @@ static MACHINE_RESET( namcos11 )
static MACHINE_CONFIG_START( coh100, namcos11_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( namcos11_map)
- MDRV_CPU_VBLANK_INT("screen", namcos11_vblank)
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
+ MCFG_CPU_PROGRAM_MAP( namcos11_map)
+ MCFG_CPU_VBLANK_INT("screen", namcos11_vblank)
- MDRV_CPU_ADD("c76", M37702, 16384000)
- MDRV_CPU_PROGRAM_MAP(c76_map)
- MDRV_CPU_IO_MAP(c76_io_map)
- MDRV_CPU_VBLANK_INT_HACK(c76_interrupt, 3)
+ MCFG_CPU_ADD("c76", M37702, 16384000)
+ MCFG_CPU_PROGRAM_MAP(c76_map)
+ MCFG_CPU_IO_MAP(c76_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(c76_interrupt, 3)
- MDRV_MACHINE_RESET( namcos11 )
+ MCFG_MACHINE_RESET( namcos11 )
/* 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( 1024, 1024 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
-
- MDRV_PALETTE_LENGTH( 65536 )
-
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type1 )
- MDRV_VIDEO_UPDATE( psx )
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, 16384000)
- 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)
-
- MDRV_AT28C16_ADD( "at28c16", NULL )
+ 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( 1024, 1024 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+
+ MCFG_PALETTE_LENGTH( 65536 )
+
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type1 )
+ MCFG_VIDEO_UPDATE( psx )
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("c352", C352, 16384000)
+ 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)
+
+ MCFG_AT28C16_ADD( "at28c16", NULL )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( coh110, coh100 )
- MDRV_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_START( psx_type2 )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE( 30 )
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE( 30 )
MACHINE_CONFIG_END
static INPUT_PORTS_START( namcos11 )
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 2ebf9b2449d..23b39e9a336 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1560,41 +1560,41 @@ static DRIVER_INIT( ghlpanic )
static MACHINE_CONFIG_START( coh700, namcos12_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", CXD8661R, XTAL_100MHz )
- MDRV_CPU_PROGRAM_MAP( namcos12_map)
- MDRV_CPU_VBLANK_INT("screen", psx_vblank)
+ MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL_100MHz )
+ MCFG_CPU_PROGRAM_MAP( namcos12_map)
+ MCFG_CPU_VBLANK_INT("screen", psx_vblank)
- MDRV_CPU_ADD("sub", H83002, 16737350 )
- MDRV_CPU_PROGRAM_MAP( s12h8rwmap)
- MDRV_CPU_IO_MAP( s12h8iomap)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_pulse)
+ MCFG_CPU_ADD("sub", H83002, 16737350 )
+ MCFG_CPU_PROGRAM_MAP( s12h8rwmap)
+ MCFG_CPU_IO_MAP( s12h8iomap)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_pulse)
- MDRV_MACHINE_RESET( namcos12 )
+ MCFG_MACHINE_RESET( namcos12 )
/* 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( 1024, 1024 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ 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( 1024, 1024 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type2 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, 16737350)
- 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_SOUND_ADD("c352", C352, 16737350)
+ 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)
- MDRV_AT28C16_ADD( "at28c16", NULL )
+ MCFG_AT28C16_ADD( "at28c16", NULL )
MACHINE_CONFIG_END
static INPUT_PORTS_START( namcos12 )
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index f21f221cb8a..9041eaaf6dd 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -1607,330 +1607,330 @@ via software as INT1
/*************************************************************/
static MACHINE_CONFIG_START( default, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(master_default_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(master_default_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(slave_default_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(slave_default_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MDRV_CPU_PROGRAM_MAP(sound_default_am)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120)
+ MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_CPU_PROGRAM_MAP(sound_default_am)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, 120)
- MDRV_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MDRV_CPU_PROGRAM_MAP(mcu_default_am)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_CPU_PROGRAM_MAP(mcu_default_am)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(12000)) /* CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(12000)) /* CPU slices per frame */
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 264)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 264)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(namcos2)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(namcos2)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(namcos2)
- MDRV_VIDEO_UPDATE(namcos2_default)
+ MCFG_VIDEO_START(namcos2)
+ MCFG_VIDEO_UPDATE(namcos2_default)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
- MDRV_SOUND_CONFIG(c140_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
+ MCFG_SOUND_CONFIG(c140_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
/* adjusted machine driver start */
static MACHINE_CONFIG_DERIVED( default2, default )
- MDRV_SOUND_REPLACE("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
- MDRV_SOUND_CONFIG(c140_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_REPLACE("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
+ MCFG_SOUND_CONFIG(c140_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/* end */
static MACHINE_CONFIG_DERIVED( assaultp, default2 )
- MDRV_QUANTUM_TIME(HZ(12000*8)) /* CPU slices per frame - boosted (along with MCU speed) so that the Mode Select works */
+ MCFG_QUANTUM_TIME(HZ(12000*8)) /* CPU slices per frame - boosted (along with MCU speed) so that the Mode Select works */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( default3, default )
- MDRV_SOUND_REPLACE("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
- MDRV_SOUND_CONFIG(c140_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_REPLACE("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
+ MCFG_SOUND_CONFIG(c140_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_SOUND_REPLACE("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gollygho, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(master_default_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(master_default_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(slave_default_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(slave_default_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MDRV_CPU_PROGRAM_MAP(sound_default_am)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120)
+ MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_CPU_PROGRAM_MAP(sound_default_am)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, 120)
- MDRV_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MDRV_CPU_PROGRAM_MAP(mcu_default_am)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_CPU_PROGRAM_MAP(mcu_default_am)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 264)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 264)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(namcos2)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(namcos2)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(namcos2)
- MDRV_VIDEO_UPDATE(namcos2_default)
+ MCFG_VIDEO_START(namcos2)
+ MCFG_VIDEO_UPDATE(namcos2_default)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
- MDRV_SOUND_CONFIG(c140_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
+ MCFG_SOUND_CONFIG(c140_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( finallap, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(master_finallap_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(master_finallap_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(slave_finallap_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(slave_finallap_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MDRV_CPU_PROGRAM_MAP(sound_default_am)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120)
+ MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_CPU_PROGRAM_MAP(sound_default_am)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, 120)
- MDRV_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MDRV_CPU_PROGRAM_MAP(mcu_default_am)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_CPU_PROGRAM_MAP(mcu_default_am)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 264)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 264)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(finallap)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(finallap)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(finallap)
- MDRV_VIDEO_UPDATE(finallap)
+ MCFG_VIDEO_START(finallap)
+ MCFG_VIDEO_UPDATE(finallap)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
- MDRV_SOUND_CONFIG(c140_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
+ MCFG_SOUND_CONFIG(c140_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sgunner, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(master_sgunner_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(master_sgunner_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(slave_sgunner_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(slave_sgunner_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MDRV_CPU_PROGRAM_MAP(sound_default_am)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120)
+ MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_CPU_PROGRAM_MAP(sound_default_am)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, 120)
- MDRV_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MDRV_CPU_PROGRAM_MAP(mcu_default_am)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_CPU_PROGRAM_MAP(mcu_default_am)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 264)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 264)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(sgunner)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(sgunner)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(sgunner)
- MDRV_VIDEO_UPDATE(sgunner)
+ MCFG_VIDEO_START(sgunner)
+ MCFG_VIDEO_UPDATE(sgunner)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
- MDRV_SOUND_CONFIG(c140_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
+ MCFG_SOUND_CONFIG(c140_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( luckywld, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(master_luckywld_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(master_luckywld_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(slave_luckywld_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(slave_luckywld_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MDRV_CPU_PROGRAM_MAP(sound_default_am)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
+ MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_CPU_PROGRAM_MAP(sound_default_am)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,120)
- MDRV_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MDRV_CPU_PROGRAM_MAP(mcu_default_am)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_CPU_PROGRAM_MAP(mcu_default_am)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 264)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 264)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(luckywld)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(luckywld)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(luckywld)
- MDRV_VIDEO_UPDATE(luckywld)
+ MCFG_VIDEO_START(luckywld)
+ MCFG_VIDEO_UPDATE(luckywld)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
- MDRV_SOUND_CONFIG(c140_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
+ MCFG_SOUND_CONFIG(c140_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( metlhawk, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(master_metlhawk_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(master_metlhawk_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MDRV_CPU_PROGRAM_MAP(slave_metlhawk_am)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_CPU_PROGRAM_MAP(slave_metlhawk_am)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MDRV_CPU_PROGRAM_MAP(sound_default_am)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
+ MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_CPU_PROGRAM_MAP(sound_default_am)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,120)
- MDRV_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MDRV_CPU_PROGRAM_MAP(mcu_default_am)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_CPU_PROGRAM_MAP(mcu_default_am)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* CPU slices per frame */
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 264)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (49152000.0 / 8) / (384 * 264) )
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 264)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(metlhawk)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(metlhawk)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(metlhawk)
- MDRV_VIDEO_UPDATE(metlhawk)
+ MCFG_VIDEO_START(metlhawk)
+ MCFG_VIDEO_UPDATE(metlhawk)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
- MDRV_SOUND_CONFIG(c140_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("c140", C140, C140_SOUND_CLOCK) /* 21.333kHz */
+ MCFG_SOUND_CONFIG(c140_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 28cc841fd0b..e2a18f57da0 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1524,193 +1524,193 @@ static const c140_interface C140_interface_typeB =
};
static MACHINE_CONFIG_START( s21base, namcos21_state )
- MDRV_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MDRV_CPU_PROGRAM_MAP(namcos21_68k_master)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
+ MCFG_CPU_PROGRAM_MAP(namcos21_68k_master)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */
- MDRV_CPU_PROGRAM_MAP(namcos21_68k_slave)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000,12288000) /* Slave */
+ MCFG_CPU_PROGRAM_MAP(namcos21_68k_slave)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
- MDRV_CPU_PROGRAM_MAP(am_sound_winrun)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
+ MCFG_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
+ MCFG_CPU_PROGRAM_MAP(am_sound_winrun)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,120)
- MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MDRV_CPU_PROGRAM_MAP(am_mcu_winrun)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */
+ MCFG_CPU_PROGRAM_MAP(am_mcu_winrun)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("dspmaster", TMS32025,24000000) /* 24 MHz? overclocked */
- MDRV_CPU_PROGRAM_MAP(master_dsp_program)
- MDRV_CPU_DATA_MAP(master_dsp_data)
- MDRV_CPU_IO_MAP(master_dsp_io)
+ MCFG_CPU_ADD("dspmaster", TMS32025,24000000) /* 24 MHz? overclocked */
+ MCFG_CPU_PROGRAM_MAP(master_dsp_program)
+ MCFG_CPU_DATA_MAP(master_dsp_data)
+ MCFG_CPU_IO_MAP(master_dsp_io)
- MDRV_CPU_ADD("dspslave", TMS32025,24000000*4) /* 24 MHz?; overclocked */
- MDRV_CPU_PROGRAM_MAP(slave_dsp_program)
- MDRV_CPU_DATA_MAP(slave_dsp_data)
- MDRV_CPU_IO_MAP(slave_dsp_io)
+ MCFG_CPU_ADD("dspslave", TMS32025,24000000*4) /* 24 MHz?; overclocked */
+ MCFG_CPU_PROGRAM_MAP(slave_dsp_program)
+ MCFG_CPU_DATA_MAP(slave_dsp_data)
+ MCFG_CPU_IO_MAP(slave_dsp_io)
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- 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(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT)
- MDRV_SCREEN_VISIBLE_AREA(0,495,0,479)
+ 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(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT)
+ MCFG_SCREEN_VISIBLE_AREA(0,495,0,479)
- MDRV_GFXDECODE(namcos21)
- MDRV_PALETTE_LENGTH(NAMCOS21_NUM_COLORS)
+ MCFG_GFXDECODE(namcos21)
+ MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS)
- MDRV_VIDEO_START(namcos21)
- MDRV_VIDEO_UPDATE(namcos21)
+ MCFG_VIDEO_START(namcos21)
+ MCFG_VIDEO_UPDATE(namcos21)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( poly_c140_typeA, s21base )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, 8000000/374)
- MDRV_SOUND_CONFIG(C140_interface_typeA)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("c140", C140, 8000000/374)
+ MCFG_SOUND_CONFIG(C140_interface_typeA)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579580)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579580)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( poly_c140_typeB, s21base )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, 8000000/374)
- MDRV_SOUND_CONFIG(C140_interface_typeB)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("c140", C140, 8000000/374)
+ MCFG_SOUND_CONFIG(C140_interface_typeB)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579580)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579580)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( driveyes, namcos21_state )
- MDRV_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MDRV_CPU_PROGRAM_MAP(driveyes_68k_master)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
+ MCFG_CPU_PROGRAM_MAP(driveyes_68k_master)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */
- MDRV_CPU_PROGRAM_MAP(driveyes_68k_slave)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000,12288000) /* Slave */
+ MCFG_CPU_PROGRAM_MAP(driveyes_68k_slave)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
- MDRV_CPU_PROGRAM_MAP(am_sound_winrun)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
+ MCFG_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
+ MCFG_CPU_PROGRAM_MAP(am_sound_winrun)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,120)
- MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MDRV_CPU_PROGRAM_MAP(am_mcu_winrun)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */
+ MCFG_CPU_PROGRAM_MAP(am_mcu_winrun)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("dsp", TMS32025,24000000*2) /* 24 MHz? overclocked */
- MDRV_CPU_PROGRAM_MAP(winrun_dsp_program)
- MDRV_CPU_DATA_MAP(winrun_dsp_data)
- MDRV_CPU_IO_MAP(winrun_dsp_io)
+ MCFG_CPU_ADD("dsp", TMS32025,24000000*2) /* 24 MHz? overclocked */
+ MCFG_CPU_PROGRAM_MAP(winrun_dsp_program)
+ MCFG_CPU_DATA_MAP(winrun_dsp_data)
+ MCFG_CPU_IO_MAP(winrun_dsp_io)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- 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(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT)
- MDRV_SCREEN_VISIBLE_AREA(0,495,0,479)
+ 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(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT)
+ MCFG_SCREEN_VISIBLE_AREA(0,495,0,479)
- MDRV_GFXDECODE(namcos21)
- MDRV_PALETTE_LENGTH(NAMCOS21_NUM_COLORS)
+ MCFG_GFXDECODE(namcos21)
+ MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS)
- MDRV_VIDEO_START(namcos21)
- MDRV_VIDEO_UPDATE(namcos21)
+ MCFG_VIDEO_START(namcos21)
+ MCFG_VIDEO_UPDATE(namcos21)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, 8000000/374)
- MDRV_SOUND_CONFIG(C140_interface_typeA)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("c140", C140, 8000000/374)
+ MCFG_SOUND_CONFIG(C140_interface_typeA)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579580)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579580)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( winrun_c140_typeB, namcos21_state )
- MDRV_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MDRV_CPU_PROGRAM_MAP(am_master_winrun)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
+ MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
+ MCFG_CPU_PROGRAM_MAP(am_master_winrun)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_master_vblank)
- MDRV_CPU_ADD("slave", M68000,12288000) /* Slave */
- MDRV_CPU_PROGRAM_MAP(am_slave_winrun)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
+ MCFG_CPU_ADD("slave", M68000,12288000) /* Slave */
+ MCFG_CPU_PROGRAM_MAP(am_slave_winrun)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_slave_vblank)
- MDRV_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
- MDRV_CPU_PROGRAM_MAP(am_sound_winrun)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,120)
+ MCFG_CPU_ADD("audiocpu", M6809,3072000) /* Sound */
+ MCFG_CPU_PROGRAM_MAP(am_sound_winrun)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,120)
- MDRV_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MDRV_CPU_PROGRAM_MAP(am_mcu_winrun)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */
+ MCFG_CPU_PROGRAM_MAP(am_mcu_winrun)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz? overclocked */
- MDRV_CPU_PROGRAM_MAP(winrun_dsp_program)
- MDRV_CPU_DATA_MAP(winrun_dsp_data)
- MDRV_CPU_IO_MAP(winrun_dsp_io)
+ MCFG_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz? overclocked */
+ MCFG_CPU_PROGRAM_MAP(winrun_dsp_program)
+ MCFG_CPU_DATA_MAP(winrun_dsp_data)
+ MCFG_CPU_IO_MAP(winrun_dsp_io)
- MDRV_CPU_ADD("gpu", M68000,12288000) /* graphics coprocessor */
- MDRV_CPU_PROGRAM_MAP(am_gpu_winrun)
- MDRV_CPU_VBLANK_INT("screen", namcos2_68k_gpu_vblank)
+ MCFG_CPU_ADD("gpu", M68000,12288000) /* graphics coprocessor */
+ MCFG_CPU_PROGRAM_MAP(am_gpu_winrun)
+ MCFG_CPU_VBLANK_INT("screen", namcos2_68k_gpu_vblank)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
- MDRV_MACHINE_START(namcos2)
- MDRV_MACHINE_RESET(namcos2)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(namcos2)
+ MCFG_MACHINE_RESET(namcos2)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- 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(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT)
- MDRV_SCREEN_VISIBLE_AREA(0,495,0,479)
+ 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(NAMCOS21_POLY_FRAME_WIDTH,NAMCOS21_POLY_FRAME_HEIGHT)
+ MCFG_SCREEN_VISIBLE_AREA(0,495,0,479)
- MDRV_PALETTE_LENGTH(NAMCOS21_NUM_COLORS)
+ MCFG_PALETTE_LENGTH(NAMCOS21_NUM_COLORS)
- MDRV_VIDEO_START(namcos21)
- MDRV_VIDEO_UPDATE(namcos21)
+ MCFG_VIDEO_START(namcos21)
+ MCFG_VIDEO_UPDATE(namcos21)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c140", C140, 8000000/374)
- MDRV_SOUND_CONFIG(C140_interface_typeB)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("c140", C140, 8000000/374)
+ MCFG_SOUND_CONFIG(C140_interface_typeB)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579580)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579580)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
ROM_START( aircomb )
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index b0ae1a17d2a..5bb4dce2837 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -2869,50 +2869,50 @@ static INTERRUPT_GEN( mcu_interrupt )
}
static MACHINE_CONFIG_START( namcos22s, driver_device )
- MDRV_CPU_ADD("maincpu", M68EC020,SS22_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(namcos22s_am)
- MDRV_CPU_VBLANK_INT_HACK(namcos22s_interrupt,2)
-
- MDRV_CPU_ADD("master", TMS32025,SS22_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(master_dsp_program)
- MDRV_CPU_DATA_MAP(master_dsp_data)
- MDRV_CPU_IO_MAP(master_dsp_io)
- MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD)
-
- MDRV_CPU_ADD("slave", TMS32025,SS22_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(slave_dsp_program)
- MDRV_CPU_DATA_MAP(slave_dsp_data)
- MDRV_CPU_IO_MAP(slave_dsp_io)
-
- MDRV_CPU_ADD("mcu", M37710, SS22_MASTER_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(mcu_program)
- MDRV_CPU_IO_MAP( mcu_io)
- MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
-
- MDRV_QUANTUM_TIME(HZ(6000))
-
- MDRV_NVRAM_HANDLER(namcos22)
- 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_RGB32)
- MDRV_SCREEN_SIZE(NAMCOS22_NUM_COLS*16,NAMCOS22_NUM_ROWS*16)
- MDRV_SCREEN_VISIBLE_AREA(0,NAMCOS22_NUM_COLS*16-1,0,NAMCOS22_NUM_ROWS*16-1)
-
- MDRV_PALETTE_LENGTH(NAMCOS22_PALETTE_SIZE)
- MDRV_GFXDECODE(super)
- MDRV_VIDEO_START(namcos22s)
- MDRV_VIDEO_UPDATE(namcos22s)
- MDRV_MACHINE_RESET(namcoss22)
+ MCFG_CPU_ADD("maincpu", M68EC020,SS22_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(namcos22s_am)
+ MCFG_CPU_VBLANK_INT_HACK(namcos22s_interrupt,2)
+
+ MCFG_CPU_ADD("master", TMS32025,SS22_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(master_dsp_program)
+ MCFG_CPU_DATA_MAP(master_dsp_data)
+ MCFG_CPU_IO_MAP(master_dsp_io)
+ MCFG_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD)
+
+ MCFG_CPU_ADD("slave", TMS32025,SS22_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(slave_dsp_program)
+ MCFG_CPU_DATA_MAP(slave_dsp_data)
+ MCFG_CPU_IO_MAP(slave_dsp_io)
+
+ MCFG_CPU_ADD("mcu", M37710, SS22_MASTER_CLOCK/3)
+ MCFG_CPU_PROGRAM_MAP(mcu_program)
+ MCFG_CPU_IO_MAP( mcu_io)
+ MCFG_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
+
+ MCFG_QUANTUM_TIME(HZ(6000))
+
+ MCFG_NVRAM_HANDLER(namcos22)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(NAMCOS22_NUM_COLS*16,NAMCOS22_NUM_ROWS*16)
+ MCFG_SCREEN_VISIBLE_AREA(0,NAMCOS22_NUM_COLS*16-1,0,NAMCOS22_NUM_ROWS*16-1)
+
+ MCFG_PALETTE_LENGTH(NAMCOS22_PALETTE_SIZE)
+ MCFG_GFXDECODE(super)
+ MCFG_VIDEO_START(namcos22s)
+ MCFG_VIDEO_UPDATE(namcos22s)
+ MCFG_MACHINE_RESET(namcoss22)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, SS22_MASTER_CLOCK/3)
- 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_SOUND_ADD("c352", C352, SS22_MASTER_CLOCK/3)
+ 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)
MACHINE_CONFIG_END
/*********************************************************************************/
@@ -3285,47 +3285,47 @@ static MACHINE_RESET(namcos22)
}
static MACHINE_CONFIG_START( namcos22, driver_device )
- MDRV_CPU_ADD("maincpu", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */
- MDRV_CPU_PROGRAM_MAP(namcos22_am)
- MDRV_CPU_VBLANK_INT_HACK(namcos22_interrupt,2)
-
- MDRV_CPU_ADD("master", TMS32025,SS22_MASTER_CLOCK) /* ? */
- MDRV_CPU_PROGRAM_MAP(master_dsp_program)
- MDRV_CPU_DATA_MAP(master_dsp_data)
- MDRV_CPU_IO_MAP(master_dsp_io)
- MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD)
-
- MDRV_CPU_ADD("slave", TMS32025,SS22_MASTER_CLOCK) /* ? */
- MDRV_CPU_PROGRAM_MAP(slave_dsp_program)
- MDRV_CPU_DATA_MAP(slave_dsp_data)
- MDRV_CPU_IO_MAP(slave_dsp_io)
-
- MDRV_CPU_ADD("mcu", M37702, SS22_MASTER_CLOCK/3) // C74 on the CPU board has no periodic interrupts, it runs entirely off Timer A0
- MDRV_CPU_PROGRAM_MAP( mcu_s22_program)
- MDRV_CPU_IO_MAP( mcu_s22_io)
-
- MDRV_NVRAM_HANDLER(namcos22)
- 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_RGB32)
- MDRV_SCREEN_SIZE(NAMCOS22_NUM_COLS*16,NAMCOS22_NUM_ROWS*16)
- MDRV_SCREEN_VISIBLE_AREA(0,NAMCOS22_NUM_COLS*16-1,0,NAMCOS22_NUM_ROWS*16-1)
-
- MDRV_PALETTE_LENGTH(NAMCOS22_PALETTE_SIZE)
- MDRV_GFXDECODE(namcos22)
- MDRV_VIDEO_START(namcos22)
- MDRV_VIDEO_UPDATE(namcos22)
- MDRV_MACHINE_RESET(namcos22)
+ MCFG_CPU_ADD("maincpu", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */
+ MCFG_CPU_PROGRAM_MAP(namcos22_am)
+ MCFG_CPU_VBLANK_INT_HACK(namcos22_interrupt,2)
+
+ MCFG_CPU_ADD("master", TMS32025,SS22_MASTER_CLOCK) /* ? */
+ MCFG_CPU_PROGRAM_MAP(master_dsp_program)
+ MCFG_CPU_DATA_MAP(master_dsp_data)
+ MCFG_CPU_IO_MAP(master_dsp_io)
+ MCFG_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD)
+
+ MCFG_CPU_ADD("slave", TMS32025,SS22_MASTER_CLOCK) /* ? */
+ MCFG_CPU_PROGRAM_MAP(slave_dsp_program)
+ MCFG_CPU_DATA_MAP(slave_dsp_data)
+ MCFG_CPU_IO_MAP(slave_dsp_io)
+
+ MCFG_CPU_ADD("mcu", M37702, SS22_MASTER_CLOCK/3) // C74 on the CPU board has no periodic interrupts, it runs entirely off Timer A0
+ MCFG_CPU_PROGRAM_MAP( mcu_s22_program)
+ MCFG_CPU_IO_MAP( mcu_s22_io)
+
+ MCFG_NVRAM_HANDLER(namcos22)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(NAMCOS22_NUM_COLS*16,NAMCOS22_NUM_ROWS*16)
+ MCFG_SCREEN_VISIBLE_AREA(0,NAMCOS22_NUM_COLS*16-1,0,NAMCOS22_NUM_ROWS*16-1)
+
+ MCFG_PALETTE_LENGTH(NAMCOS22_PALETTE_SIZE)
+ MCFG_GFXDECODE(namcos22)
+ MCFG_VIDEO_START(namcos22)
+ MCFG_VIDEO_UPDATE(namcos22)
+ MCFG_MACHINE_RESET(namcos22)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, SS22_MASTER_CLOCK/3)
- 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_SOUND_ADD("c352", C352, SS22_MASTER_CLOCK/3)
+ 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)
MACHINE_CONFIG_END
/*********************************************************************************/
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 2b78df8b5e8..df67dd09e02 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -2700,171 +2700,171 @@ static const mips3_config r4650_config =
static MACHINE_CONFIG_START( gorgon, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*4)
- MDRV_CPU_CONFIG(r4650_config)
- MDRV_CPU_PROGRAM_MAP(gorgon_map)
- MDRV_CPU_VBLANK_INT("screen", s23_interrupt)
+ MCFG_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*4)
+ MCFG_CPU_CONFIG(r4650_config)
+ MCFG_CPU_PROGRAM_MAP(gorgon_map)
+ MCFG_CPU_VBLANK_INT("screen", s23_interrupt)
- MDRV_CPU_ADD("audiocpu", H83002, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23h8rwmap )
- MDRV_CPU_IO_MAP( s23h8iomap )
- MDRV_CPU_VBLANK_INT("screen", irq1_line_pulse)
+ MCFG_CPU_ADD("audiocpu", H83002, 14745600 )
+ MCFG_CPU_PROGRAM_MAP( s23h8rwmap )
+ MCFG_CPU_IO_MAP( s23h8iomap )
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_pulse)
- MDRV_CPU_ADD("ioboard", H83334, 14745600 )
- MDRV_CPU_PROGRAM_MAP( gorgoniobrdmap )
- MDRV_CPU_IO_MAP( s23iobrdiomap )
+ MCFG_CPU_ADD("ioboard", H83334, 14745600 )
+ MCFG_CPU_PROGRAM_MAP( gorgoniobrdmap )
+ MCFG_CPU_IO_MAP( s23iobrdiomap )
- MDRV_QUANTUM_TIME(HZ(60000))
+ MCFG_QUANTUM_TIME(HZ(60000))
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(S23_VSYNC1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // Not in any way accurate
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(S23_VSYNC1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // Not in any way accurate
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_GFXDECODE(namcos23)
+ MCFG_GFXDECODE(namcos23)
- MDRV_VIDEO_START(ss23)
- MDRV_VIDEO_UPDATE(ss23)
+ MCFG_VIDEO_START(ss23)
+ MCFG_VIDEO_UPDATE(ss23)
- MDRV_MACHINE_START(s23)
+ MCFG_MACHINE_START(s23)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, 14745600)
- 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_SOUND_ADD("c352", C352, 14745600)
+ 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)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( s23, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*4)
- MDRV_CPU_CONFIG(r4650_config)
- MDRV_CPU_PROGRAM_MAP(ss23_map)
- MDRV_CPU_VBLANK_INT("screen", s23_interrupt)
+ MCFG_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*4)
+ MCFG_CPU_CONFIG(r4650_config)
+ MCFG_CPU_PROGRAM_MAP(ss23_map)
+ MCFG_CPU_VBLANK_INT("screen", s23_interrupt)
- MDRV_CPU_ADD("audiocpu", H83002, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23h8rwmap )
- MDRV_CPU_IO_MAP( s23h8iomap )
- MDRV_CPU_VBLANK_INT("screen", irq1_line_pulse)
+ MCFG_CPU_ADD("audiocpu", H83002, 14745600 )
+ MCFG_CPU_PROGRAM_MAP( s23h8rwmap )
+ MCFG_CPU_IO_MAP( s23h8iomap )
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_pulse)
- MDRV_CPU_ADD("ioboard", H83334, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23iobrdmap )
- MDRV_CPU_IO_MAP( s23iobrdiomap )
+ MCFG_CPU_ADD("ioboard", H83334, 14745600 )
+ MCFG_CPU_PROGRAM_MAP( s23iobrdmap )
+ MCFG_CPU_IO_MAP( s23iobrdiomap )
- MDRV_QUANTUM_TIME(HZ(60*18000)) // higher than 60*20000 causes timecrs2 crash after power-on test $1e
+ MCFG_QUANTUM_TIME(HZ(60*18000)) // higher than 60*20000 causes timecrs2 crash after power-on test $1e
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(S23_VSYNC1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // Not in any way accurate
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(S23_VSYNC1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // Not in any way accurate
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_GFXDECODE(namcos23)
+ MCFG_GFXDECODE(namcos23)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_VIDEO_START(ss23)
- MDRV_VIDEO_UPDATE(ss23)
+ MCFG_VIDEO_START(ss23)
+ MCFG_VIDEO_UPDATE(ss23)
- MDRV_MACHINE_START(s23)
+ MCFG_MACHINE_START(s23)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, 14745600)
- 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_SOUND_ADD("c352", C352, 14745600)
+ 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)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ss23, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*5)
- MDRV_CPU_CONFIG(r4650_config)
- MDRV_CPU_PROGRAM_MAP(ss23_map)
- MDRV_CPU_VBLANK_INT("screen", s23_interrupt)
+ MCFG_CPU_ADD("maincpu", R4650BE, S23_BUSCLOCK*5)
+ MCFG_CPU_CONFIG(r4650_config)
+ MCFG_CPU_PROGRAM_MAP(ss23_map)
+ MCFG_CPU_VBLANK_INT("screen", s23_interrupt)
- MDRV_CPU_ADD("audiocpu", H83002, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23h8rwmap )
- MDRV_CPU_IO_MAP( s23h8noiobmap )
- MDRV_CPU_VBLANK_INT("screen", irq1_line_pulse)
+ MCFG_CPU_ADD("audiocpu", H83002, 14745600 )
+ MCFG_CPU_PROGRAM_MAP( s23h8rwmap )
+ MCFG_CPU_IO_MAP( s23h8noiobmap )
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_pulse)
- MDRV_QUANTUM_TIME(HZ(60*18000)) // higher than 60*20000 causes timecrs2 crash after power-on test $1e
+ MCFG_QUANTUM_TIME(HZ(60*18000)) // higher than 60*20000 causes timecrs2 crash after power-on test $1e
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(S23_VSYNC1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // Not in any way accurate
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(S23_VSYNC1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // Not in any way accurate
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_GFXDECODE(namcos23)
+ MCFG_GFXDECODE(namcos23)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_VIDEO_START(ss23)
- MDRV_VIDEO_UPDATE(ss23)
+ MCFG_VIDEO_START(ss23)
+ MCFG_VIDEO_UPDATE(ss23)
- MDRV_MACHINE_START(s23)
+ MCFG_MACHINE_START(s23)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("c352", C352, 14745600)
- 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_SOUND_ADD("c352", C352, 14745600)
+ 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)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ss23io, ss23 )
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_IO_MAP( s23h8iomap )
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_IO_MAP( s23h8iomap )
- MDRV_CPU_ADD("ioboard", H83334, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23iobrdmap )
- MDRV_CPU_IO_MAP( s23iobrdiomap )
+ MCFG_CPU_ADD("ioboard", H83334, 14745600 )
+ MCFG_CPU_PROGRAM_MAP( s23iobrdmap )
+ MCFG_CPU_IO_MAP( s23iobrdiomap )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ss23e2, ss23 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(S23_BUSCLOCK*6)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(S23_BUSCLOCK*6)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_IO_MAP( s23h8iomap )
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_IO_MAP( s23h8iomap )
- MDRV_CPU_ADD("ioboard", H83334, 14745600 )
- MDRV_CPU_PROGRAM_MAP( s23iobrdmap )
- MDRV_CPU_IO_MAP( s23iobrdiomap )
+ MCFG_CPU_ADD("ioboard", H83334, 14745600 )
+ MCFG_CPU_PROGRAM_MAP( s23iobrdmap )
+ MCFG_CPU_IO_MAP( s23iobrdiomap )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gmen, s23 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(S23_BUSCLOCK*5)
- MDRV_CPU_PROGRAM_MAP(gmen_mips_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(S23_BUSCLOCK*5)
+ MCFG_CPU_PROGRAM_MAP(gmen_mips_map)
- MDRV_CPU_ADD("gmen", SH2, 28700000)
- MDRV_CPU_PROGRAM_MAP(gmen_sh2_map)
+ MCFG_CPU_ADD("gmen", SH2, 28700000)
+ MCFG_CPU_PROGRAM_MAP(gmen_sh2_map)
- MDRV_MACHINE_RESET(gmen)
+ MCFG_MACHINE_RESET(gmen)
MACHINE_CONFIG_END
ROM_START( rapidrvr )
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 779625150ee..0ea2323c122 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -997,116 +997,116 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( hopmappy, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu1", M6809, 49152000/32)
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("cpu1", M6809, 49152000/32)
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("cpu2", M6809, 49152000/32)
- MDRV_CPU_PROGRAM_MAP(hopmappy_cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("cpu2", M6809, 49152000/32)
+ MCFG_CPU_PROGRAM_MAP(hopmappy_cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */
- MDRV_CPU_PROGRAM_MAP(hopmappy_mcu_map)
- MDRV_CPU_IO_MAP(mcu_port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
+ MCFG_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */
+ MCFG_CPU_PROGRAM_MAP(hopmappy_mcu_map)
+ MCFG_CPU_IO_MAP(mcu_port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
- MDRV_QUANTUM_TIME(HZ(48000)) /* heavy interleaving needed to avoid hangs in rthunder */
+ MCFG_QUANTUM_TIME(HZ(48000)) /* heavy interleaving needed to avoid hangs in rthunder */
- MDRV_MACHINE_RESET(namco86)
+ MCFG_MACHINE_RESET(namco86)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- 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(3 + 8*8, 3 + 44*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ 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(3 + 8*8, 3 + 44*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(namcos86)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(namcos86)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(namcos86)
- MDRV_VIDEO_START(namcos86)
- MDRV_VIDEO_UPDATE(namcos86)
- MDRV_VIDEO_EOF(namcos86)
+ MCFG_PALETTE_INIT(namcos86)
+ MCFG_VIDEO_START(namcos86)
+ MCFG_VIDEO_UPDATE(namcos86)
+ MCFG_VIDEO_EOF(namcos86)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579580)
- MDRV_SOUND_ROUTE(0, "mono", 0.0)
- MDRV_SOUND_ROUTE(1, "mono", 0.60) /* only right channel is connected */
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579580)
+ MCFG_SOUND_ROUTE(0, "mono", 0.0)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60) /* only right channel is connected */
- MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( skykiddx, hopmappy )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(skykiddx_cpu2_map)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_PROGRAM_MAP(skykiddx_cpu2_map)
- MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(skykiddx_mcu_map)
+ MCFG_CPU_MODIFY("mcu")
+ MCFG_CPU_PROGRAM_MAP(skykiddx_mcu_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( roishtar, hopmappy )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(roishtar_cpu2_map)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_PROGRAM_MAP(roishtar_cpu2_map)
- MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(roishtar_mcu_map)
+ MCFG_CPU_MODIFY("mcu")
+ MCFG_CPU_PROGRAM_MAP(roishtar_mcu_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( genpeitd, hopmappy )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(genpeitd_cpu2_map)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_PROGRAM_MAP(genpeitd_cpu2_map)
- MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(genpeitd_mcu_map)
+ MCFG_CPU_MODIFY("mcu")
+ MCFG_CPU_PROGRAM_MAP(genpeitd_mcu_map)
/* sound hardware */
- MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rthunder, hopmappy )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(rthunder_cpu2_map)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_PROGRAM_MAP(rthunder_cpu2_map)
- MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(rthunder_mcu_map)
+ MCFG_CPU_MODIFY("mcu")
+ MCFG_CPU_PROGRAM_MAP(rthunder_mcu_map)
/* sound hardware */
- MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wndrmomo, hopmappy )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(wndrmomo_cpu2_map)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_PROGRAM_MAP(wndrmomo_cpu2_map)
- MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(wndrmomo_mcu_map)
+ MCFG_CPU_MODIFY("mcu")
+ MCFG_CPU_PROGRAM_MAP(wndrmomo_mcu_map)
/* sound hardware */
- MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 386aac74158..ba2ea734e33 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -1921,40 +1921,40 @@ static MACHINE_RESET( naomi )
static MACHINE_CONFIG_START( naomi_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", SH4, CPU_CLOCK) // SH4!!!
- MDRV_CPU_CONFIG(sh4cpu_config)
- MDRV_CPU_PROGRAM_MAP(naomi_map)
- MDRV_CPU_IO_MAP(naomi_port)
+ MCFG_CPU_ADD("maincpu", SH4, CPU_CLOCK) // SH4!!!
+ MCFG_CPU_CONFIG(sh4cpu_config)
+ MCFG_CPU_PROGRAM_MAP(naomi_map)
+ MCFG_CPU_IO_MAP(naomi_port)
- MDRV_CPU_ADD("soundcpu", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
- MDRV_CPU_PROGRAM_MAP(dc_audio_map)
+ MCFG_CPU_ADD("soundcpu", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
+ MCFG_CPU_PROGRAM_MAP(dc_audio_map)
- MDRV_MACHINE_START( dc )
- MDRV_MACHINE_RESET( naomi )
+ MCFG_MACHINE_START( dc )
+ MCFG_MACHINE_RESET( naomi )
- MDRV_EEPROM_93C46_ADD("main_eeprom")
- MDRV_EEPROM_DEFAULT_VALUE(0)
+ MCFG_EEPROM_93C46_ADD("main_eeprom")
+ MCFG_EEPROM_DEFAULT_VALUE(0)
- MDRV_NVRAM_HANDLER(naomi_eeproms)
+ MCFG_NVRAM_HANDLER(naomi_eeproms)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
-
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(dc)
- MDRV_VIDEO_UPDATE(dc)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("aica", AICA, 0)
- MDRV_SOUND_CONFIG(aica_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 2.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 2.0)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
+
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(dc)
+ MCFG_VIDEO_UPDATE(dc)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("aica", AICA, 0)
+ MCFG_SOUND_CONFIG(aica_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 2.0)
MACHINE_CONFIG_END
/*
@@ -1962,7 +1962,7 @@ MACHINE_CONFIG_END
*/
static MACHINE_CONFIG_DERIVED( naomi, naomi_base )
- MDRV_NAOMI_ROM_BOARD_ADD("rom_board", "user1")
+ MCFG_NAOMI_ROM_BOARD_ADD("rom_board", "user1")
MACHINE_CONFIG_END
/*
@@ -1970,7 +1970,7 @@ MACHINE_CONFIG_END
*/
static MACHINE_CONFIG_DERIVED( naomigd, naomi_base )
- MDRV_NAOMI_DIMM_BOARD_ADD("rom_board", "gdrom", "user1", "picreturn")
+ MCFG_NAOMI_DIMM_BOARD_ADD("rom_board", "gdrom", "user1", "picreturn")
MACHINE_CONFIG_END
/*
@@ -1990,11 +1990,11 @@ MACHINE_CONFIG_END
*/
static MACHINE_CONFIG_DERIVED( aw, naomi_base )
-// MDRV_DEVICE_REMOVE("main_eeprom")
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(aw_map)
- MDRV_MACRONIX_29L001MC_ADD("awflash")
- MDRV_AW_ROM_BOARD_ADD("rom_board", "user1")
+// MCFG_DEVICE_REMOVE("main_eeprom")
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(aw_map)
+ MCFG_MACRONIX_29L001MC_ADD("awflash")
+ MCFG_AW_ROM_BOARD_ADD("rom_board", "user1")
MACHINE_CONFIG_END
#define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index b3ae5a93415..f7de3016ead 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -437,35 +437,35 @@ static const tms36xx_interface tms3615_interface =
static MACHINE_CONFIG_START( naughtyb, naughtyb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
- MDRV_CPU_PROGRAM_MAP(naughtyb_map)
- MDRV_CPU_VBLANK_INT("screen", naughtyb_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
+ MCFG_CPU_PROGRAM_MAP(naughtyb_map)
+ MCFG_CPU_VBLANK_INT("screen", naughtyb_interrupt)
/* 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(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ 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(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(naughtyb)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(naughtyb)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(naughtyb)
- MDRV_VIDEO_START(naughtyb)
- MDRV_VIDEO_UPDATE(naughtyb)
+ MCFG_PALETTE_INIT(naughtyb)
+ MCFG_VIDEO_START(naughtyb)
+ MCFG_VIDEO_UPDATE(naughtyb)
/* sound hardware */
/* uses the TMS3615NS for sound */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("tms", TMS36XX, 350)
- MDRV_SOUND_CONFIG(tms3615_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ADD("tms", TMS36XX, 350)
+ MCFG_SOUND_CONFIG(tms3615_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ADD("cust", NAUGHTYB, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ADD("cust", NAUGHTYB, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
MACHINE_CONFIG_END
@@ -473,34 +473,34 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( popflame, naughtyb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
- MDRV_CPU_PROGRAM_MAP(popflame_map)
- MDRV_CPU_VBLANK_INT("screen", naughtyb_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
+ MCFG_CPU_PROGRAM_MAP(popflame_map)
+ MCFG_CPU_VBLANK_INT("screen", naughtyb_interrupt)
/* 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(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ 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(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(naughtyb)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(naughtyb)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(naughtyb)
- MDRV_VIDEO_START(naughtyb)
- MDRV_VIDEO_UPDATE(naughtyb)
+ MCFG_PALETTE_INIT(naughtyb)
+ MCFG_VIDEO_START(naughtyb)
+ MCFG_VIDEO_UPDATE(naughtyb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("tms", TMS36XX, 350)
- MDRV_SOUND_CONFIG(tms3615_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ADD("tms", TMS36XX, 350)
+ MCFG_SOUND_CONFIG(tms3615_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ADD("cust", POPFLAME, 0)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ADD("cust", POPFLAME, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 9b31bfb8ab1..509d51d0dd8 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -2920,35 +2920,35 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( NBMJDRV_4096, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
- MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
+ MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_MACHINE_RESET(nb1413m3)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(nb1413m3)
+ 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-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, 16, 240-1)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(mbmj8688_12bit)
- MDRV_VIDEO_START(mbmj8688_pure_12bit)
- MDRV_VIDEO_UPDATE(mbmj8688)
+ MCFG_PALETTE_INIT(mbmj8688_12bit)
+ MCFG_VIDEO_START(mbmj8688_pure_12bit)
+ MCFG_VIDEO_UPDATE(mbmj8688)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("psg", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("psg", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- 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
@@ -2957,10 +2957,10 @@ static MACHINE_CONFIG_DERIVED( NBMJDRV_256, NBMJDRV_4096 )
/* basic machine hardware */
/* video hardware */
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(mbmj8688_8bit)
- MDRV_VIDEO_START(mbmj8688_8bit)
+ MCFG_PALETTE_INIT(mbmj8688_8bit)
+ MCFG_VIDEO_START(mbmj8688_8bit)
MACHINE_CONFIG_END
@@ -2969,12 +2969,12 @@ static MACHINE_CONFIG_DERIVED( NBMJDRV_65536, NBMJDRV_4096 )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_PALETTE_INIT(mbmj8688_16bit)
- MDRV_VIDEO_START(mbmj8688_hybrid_16bit)
+ MCFG_PALETTE_INIT(mbmj8688_16bit)
+ MCFG_VIDEO_START(mbmj8688_hybrid_16bit)
MACHINE_CONFIG_END
@@ -2983,191 +2983,191 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( crystalg, NBMJDRV_256 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map)
- MDRV_CPU_IO_MAP(crystalg_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 96) // nmiclock = 2f
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(secolove_map)
+ MCFG_CPU_IO_MAP(crystalg_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 96) // nmiclock = 2f
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( apparel, NBMJDRV_256 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map)
- MDRV_CPU_IO_MAP(secolove_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(secolove_map)
+ MCFG_CPU_IO_MAP(secolove_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mbmj_h12bit, NBMJDRV_4096 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map)
- MDRV_CPU_IO_MAP(secolove_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(secolove_map)
+ MCFG_CPU_IO_MAP(secolove_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
/* video hardware */
- MDRV_VIDEO_START(mbmj8688_hybrid_12bit)
+ MCFG_VIDEO_START(mbmj8688_hybrid_12bit)
MACHINE_CONFIG_END
/*Same as h12bit HW with different sound HW + NMI enable bit*/
static MACHINE_CONFIG_DERIVED( barline, mbmj_h12bit )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(barline_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(barline_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
- MDRV_SOUND_REPLACE("psg", YM3812, 20000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_REPLACE("psg", YM3812, 20000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_DEVICE_REMOVE("dac")
+ MCFG_DEVICE_REMOVE("dac")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mbmj_p16bit, NBMJDRV_65536 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map)
- MDRV_CPU_IO_MAP(secolove_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60/40
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(secolove_map)
+ MCFG_CPU_IO_MAP(secolove_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60/40
/* video hardware */
- MDRV_VIDEO_START(mbmj8688_pure_16bit)
+ MCFG_VIDEO_START(mbmj8688_pure_16bit)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mbmj_p16bit_LCD, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
- MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_CPU_PROGRAM_MAP(secolove_map)
- MDRV_CPU_IO_MAP(secolove_io_map)
- MDRV_CPU_IO_MAP(p16bit_LCD_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
+ MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
+ MCFG_CPU_PROGRAM_MAP(secolove_map)
+ MCFG_CPU_IO_MAP(secolove_io_map)
+ MCFG_CPU_IO_MAP(p16bit_LCD_io_map)
- MDRV_MACHINE_RESET(nb1413m3)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(nb1413m3)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_PALETTE_LENGTH(65536)
- MDRV_PALETTE_INIT(mbmj8688_16bit)
- MDRV_DEFAULT_LAYOUT(layout_nbmj8688)
-
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
-
- MDRV_SCREEN_ADD("lcd0", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(480, 64)
- MDRV_SCREEN_VISIBLE_AREA(0, 480-1, 0, 64-1)
-
- MDRV_SCREEN_ADD("lcd1", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(480, 64)
- MDRV_SCREEN_VISIBLE_AREA(0, 480-1, 0, 64-1)
-
- MDRV_VIDEO_START(mbmj8688_pure_16bit_LCD)
- MDRV_VIDEO_UPDATE(mbmj8688_LCD)
+ MCFG_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_INIT(mbmj8688_16bit)
+ MCFG_DEFAULT_LAYOUT(layout_nbmj8688)
+
+ 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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
+
+ MCFG_SCREEN_ADD("lcd0", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(480, 64)
+ MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 0, 64-1)
+
+ MCFG_SCREEN_ADD("lcd1", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(480, 64)
+ MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 0, 64-1)
+
+ MCFG_VIDEO_START(mbmj8688_pure_16bit_LCD)
+ MCFG_VIDEO_UPDATE(mbmj8688_LCD)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("psg", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("psg", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- 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
static MACHINE_CONFIG_DERIVED( seiha, NBMJDRV_65536 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map)
- MDRV_CPU_IO_MAP(seiha_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(secolove_map)
+ MCFG_CPU_IO_MAP(seiha_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjgaiden, NBMJDRV_4096 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ojousan_map)
- MDRV_CPU_IO_MAP(mjgaiden_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ojousan_map)
+ MCFG_CPU_IO_MAP(mjgaiden_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( iemoto, NBMJDRV_65536 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map)
- MDRV_CPU_IO_MAP(iemoto_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(secolove_map)
+ MCFG_CPU_IO_MAP(iemoto_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ojousan, NBMJDRV_65536 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ojousan_map)
- MDRV_CPU_IO_MAP(iemoto_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ojousan_map)
+ MCFG_CPU_IO_MAP(iemoto_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mbmj_p12bit, NBMJDRV_4096 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjsikaku_map)
- MDRV_CPU_IO_MAP(kaguya_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjsikaku_map)
+ MCFG_CPU_IO_MAP(kaguya_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjsikaku, NBMJDRV_4096 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjsikaku_map)
- MDRV_CPU_IO_MAP(mjsikaku_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 144) // nmiclock = 70
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjsikaku_map)
+ MCFG_CPU_IO_MAP(mjsikaku_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 144) // nmiclock = 70
/* sound hardware */
- MDRV_SOUND_REPLACE("psg", YM3812, 20000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_REPLACE("psg", YM3812, 20000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mmsikaku, NBMJDRV_4096 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(secolove_map)
- MDRV_CPU_IO_MAP(mmsikaku_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(secolove_map)
+ MCFG_CPU_IO_MAP(mmsikaku_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( otonano, mjsikaku )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(otonano_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(otonano_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index b70cfc88840..2b761f476e1 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -2609,62 +2609,62 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( gionbana, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(gionbana_map)
- MDRV_CPU_IO_MAP(gionbana_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 132) // nmiclock = 60
- MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(gionbana_map)
+ MCFG_CPU_IO_MAP(gionbana_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 132) // nmiclock = 60
+ MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_MACHINE_RESET(nb1413m3)
+ MCFG_MACHINE_RESET(nb1413m3)
/* 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, 8, 248-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, 8, 248-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(nbmj8891_2layer)
- MDRV_VIDEO_UPDATE(nbmj8891)
+ MCFG_VIDEO_START(nbmj8891_2layer)
+ MCFG_VIDEO_UPDATE(nbmj8891)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("fmsnd", YM3812, 2500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("fmsnd", YM3812, 2500000)
+ 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
static MACHINE_CONFIG_DERIVED( mgion, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mgion_map)
- MDRV_CPU_IO_MAP(mgion_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mgion_map)
+ MCFG_CPU_IO_MAP(mgion_io_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( omotesnd, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(omotesnd_map)
- MDRV_CPU_IO_MAP(omotesnd_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(omotesnd_map)
+ MCFG_CPU_IO_MAP(omotesnd_io_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* sound hardware */
- MDRV_SOUND_REPLACE("fmsnd", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_REPLACE("fmsnd", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
@@ -2672,55 +2672,55 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjcamerb, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(hanamomo_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // ?
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(hanamomo_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // ?
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
- MDRV_VIDEO_START(nbmj8891_1layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
+ MCFG_VIDEO_START(nbmj8891_1layer)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mmcamera, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(hanamomo_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(hanamomo_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
- MDRV_VIDEO_START(nbmj8891_1layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
+ MCFG_VIDEO_START(nbmj8891_1layer)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hanamomo, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hanamomo_map)
- MDRV_CPU_IO_MAP(hanamomo_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hanamomo_map)
+ MCFG_CPU_IO_MAP(hanamomo_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
- MDRV_VIDEO_START(nbmj8891_1layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
+ MCFG_VIDEO_START(nbmj8891_1layer)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( msjiken, hanamomo )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gionbana_map)
- MDRV_CPU_IO_MAP(msjiken_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gionbana_map)
+ MCFG_CPU_IO_MAP(msjiken_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70
MACHINE_CONFIG_END
@@ -2729,19 +2729,19 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( telmahjn, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70
+ MCFG_CPU_MODIFY("maincpu")
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70
/* video hardware */
- MDRV_VIDEO_START(nbmj8891_1layer)
+ MCFG_VIDEO_START(nbmj8891_1layer)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mgmen89, telmahjn )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
+ MCFG_CPU_MODIFY("maincpu")
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
MACHINE_CONFIG_END
@@ -2751,7 +2751,7 @@ static MACHINE_CONFIG_DERIVED( mjfocus, gionbana )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_START(nbmj8891_1layer)
+ MCFG_VIDEO_START(nbmj8891_1layer)
MACHINE_CONFIG_END
@@ -2759,83 +2759,83 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjnanpas, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(club90s_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(club90s_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( maiko, mjnanpas )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(maiko_map)
- MDRV_CPU_IO_MAP(maiko_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(maiko_map)
+ MCFG_CPU_IO_MAP(maiko_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mmaiko, maiko )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mmaiko_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mmaiko_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lovehous, mjnanpas )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(lovehous_map)
- MDRV_CPU_IO_MAP(lovehous_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(lovehous_map)
+ MCFG_CPU_IO_MAP(lovehous_io_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hanaoji, maiko )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hanaoji_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hanaoji_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hnxmasev, maiko )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hnxmasev_map)
- MDRV_CPU_IO_MAP(maiko_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hnxmasev_map)
+ MCFG_CPU_IO_MAP(maiko_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hnageman, maiko )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hnageman_map)
- MDRV_CPU_IO_MAP(maiko_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hnageman_map)
+ MCFG_CPU_IO_MAP(maiko_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( scandal, hanamomo )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scandalm_map)
- MDRV_CPU_IO_MAP(scandal_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(scandalm_map)
+ MCFG_CPU_IO_MAP(scandal_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bananadr, mjnanpas )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scandalm_map)
- MDRV_CPU_IO_MAP(bananadr_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(scandalm_map)
+ MCFG_CPU_IO_MAP(bananadr_io_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -2843,44 +2843,44 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjfocusm, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(scandalm_map)
- MDRV_CPU_IO_MAP(scandalm_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(scandalm_map)
+ MCFG_CPU_IO_MAP(scandalm_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
- MDRV_VIDEO_START(nbmj8891_1layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
+ MCFG_VIDEO_START(nbmj8891_1layer)
/* sound hardware */
- MDRV_SOUND_REPLACE("fmsnd", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_REPLACE("fmsnd", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( taiwanmb, gionbana )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(taiwanmb_map)
- MDRV_CPU_IO_MAP(taiwanmb_io_map)
-// MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(taiwanmb_map)
+ MCFG_CPU_IO_MAP(taiwanmb_io_map)
+// MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
- MDRV_VIDEO_START(nbmj8891_1layer)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
+ MCFG_VIDEO_START(nbmj8891_1layer)
/* sound hardware */
- MDRV_SOUND_REPLACE("fmsnd", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_REPLACE("fmsnd", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c
index 1e4895b4786..5440bad976e 100644
--- a/src/mame/drivers/nbmj8900.c
+++ b/src/mame/drivers/nbmj8900.c
@@ -319,41 +319,41 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( ohpaipee, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ohpaipee_map)
- MDRV_CPU_IO_MAP(ohpaipee_io_map)
- MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(ohpaipee_map)
+ MCFG_CPU_IO_MAP(ohpaipee_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_MACHINE_RESET(nb1413m3)
+ MCFG_MACHINE_RESET(nb1413m3)
/* 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, 8, 248-1)
- 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_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 8, 248-1)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(nbmj8900_2layer)
- MDRV_VIDEO_UPDATE(nbmj8900)
+ MCFG_VIDEO_START(nbmj8900_2layer)
+ MCFG_VIDEO_UPDATE(nbmj8900)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 2500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 2500000)
+ 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
static MACHINE_CONFIG_DERIVED( togenkyo, ohpaipee )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(togenkyo_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(togenkyo_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index b1b692f0da6..8d415fee1fc 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -1478,75 +1478,75 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( nbmjdrv1, driver_device ) // galkoku
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 25000000/5) /* 5.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(galkoku_map)
- MDRV_CPU_IO_MAP(galkoku_io_map)
- MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 25000000/5) /* 5.00 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(galkoku_map)
+ MCFG_CPU_IO_MAP(galkoku_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_MACHINE_RESET(nbmj8991)
+ MCFG_MACHINE_RESET(nbmj8991)
/* 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(1024, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-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(1024, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(nbmj8991)
- MDRV_VIDEO_UPDATE(nbmj8991_type1)
+ MCFG_VIDEO_START(nbmj8991)
+ MCFG_VIDEO_UPDATE(nbmj8991_type1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("fmsnd", YM3812, 25000000/10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("fmsnd", YM3812, 25000000/10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- 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
static MACHINE_CONFIG_START( nbmjdrv2, driver_device ) // pstadium
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 6000000/2) /* 3.00 MHz */
- MDRV_CPU_PROGRAM_MAP(pstadium_map)
- MDRV_CPU_IO_MAP(pstadium_io_map)
- MDRV_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 6000000/2) /* 3.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(pstadium_map)
+ MCFG_CPU_IO_MAP(pstadium_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.00 MHz */
- MDRV_CPU_PROGRAM_MAP(nbmj8991_sound_map)
- MDRV_CPU_IO_MAP(nbmj8991_sound_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 128*60) // ?
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(nbmj8991_sound_map)
+ MCFG_CPU_IO_MAP(nbmj8991_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 128*60) // ?
- MDRV_MACHINE_RESET(nbmj8991)
+ MCFG_MACHINE_RESET(nbmj8991)
/* 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(1024, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-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(1024, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(nbmj8991)
- MDRV_VIDEO_UPDATE(nbmj8991_type2)
+ MCFG_VIDEO_START(nbmj8991)
+ MCFG_VIDEO_UPDATE(nbmj8991_type2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("fmsnd", YM3812, 25000000/6.25)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("fmsnd", YM3812, 25000000/6.25)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1555,9 +1555,9 @@ static MACHINE_CONFIG_DERIVED( nbmjdrv3, nbmjdrv1 )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_REPLACE("fmsnd", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_REPLACE("fmsnd", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
@@ -1572,26 +1572,26 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( galkaika, nbmjdrv1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(galkaika_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(galkaika_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tokyogal, nbmjdrv1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tokyogal_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tokyogal_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tokimbsj, nbmjdrv1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(galkaika_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(galkaika_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -1610,10 +1610,10 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hyouban, nbmjdrv3 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(hyouban_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(hyouban_io_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -1626,16 +1626,16 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( triplew1, nbmjdrv2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(triplew1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(triplew1_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( triplew2, nbmjdrv2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(triplew2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(triplew2_map)
MACHINE_CONFIG_END
@@ -1648,8 +1648,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjlstory, nbmjdrv2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjlstory_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjlstory_map)
MACHINE_CONFIG_END
@@ -1662,7 +1662,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( finalbny, nbmjdrv2 )
/* basic machine hardware */
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -1675,28 +1675,28 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjgottub, nbmjdrv2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(triplew1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(triplew1_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( av2mj1bb, nbmjdrv2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(av2mj1bb_map)
- MDRV_CPU_IO_MAP(av2mj1bb_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(av2mj1bb_map)
+ MCFG_CPU_IO_MAP(av2mj1bb_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( av2mj2rg, nbmjdrv2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(av2mj2rg_map)
- MDRV_CPU_IO_MAP(av2mj1bb_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(av2mj2rg_map)
+ MCFG_CPU_IO_MAP(av2mj1bb_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 4589de38c8c..9dbb059878e 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -2914,47 +2914,47 @@ static const z80_daisy_config daisy_chain_sound[] =
static MACHINE_CONFIG_START( NBMJDRV1, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 12000000/2) /* TMPZ84C011, 6.00 MHz */
- MDRV_CPU_CONFIG(daisy_chain_main)
- MDRV_CPU_PROGRAM_MAP(sailorws_map)
- MDRV_CPU_IO_MAP(sailorws_io_map)
- MDRV_CPU_VBLANK_INT("screen", ctc0_trg1) /* vblank is connect to ctc triggfer */
+ MCFG_CPU_ADD("maincpu", Z80, 12000000/2) /* TMPZ84C011, 6.00 MHz */
+ MCFG_CPU_CONFIG(daisy_chain_main)
+ MCFG_CPU_PROGRAM_MAP(sailorws_map)
+ MCFG_CPU_IO_MAP(sailorws_io_map)
+ MCFG_CPU_VBLANK_INT("screen", ctc0_trg1) /* vblank is connect to ctc triggfer */
- MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* TMPZ84C011, 8.00 MHz */
- MDRV_CPU_CONFIG(daisy_chain_sound)
- MDRV_CPU_PROGRAM_MAP(sailorws_sound_map)
- MDRV_CPU_IO_MAP(sailorws_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* TMPZ84C011, 8.00 MHz */
+ MCFG_CPU_CONFIG(daisy_chain_sound)
+ MCFG_CPU_PROGRAM_MAP(sailorws_sound_map)
+ MCFG_CPU_IO_MAP(sailorws_sound_io_map)
- MDRV_Z80CTC_ADD("main_ctc", 12000000/2 /* same as "maincpu" */, ctc_intf_main)
- MDRV_Z80CTC_ADD("audio_ctc", 8000000 /* same as "audiocpu" */, ctc_intf_audio)
+ MCFG_Z80CTC_ADD("main_ctc", 12000000/2 /* same as "maincpu" */, ctc_intf_main)
+ MCFG_Z80CTC_ADD("audio_ctc", 8000000 /* same as "audiocpu" */, ctc_intf_audio)
- MDRV_MACHINE_RESET(sailorws)
+ MCFG_MACHINE_RESET(sailorws)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(1024, 512) /* no way this is correct */
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(1024, 512) /* no way this is correct */
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(nbmj9195_2layer)
- MDRV_VIDEO_UPDATE(nbmj9195)
+ MCFG_VIDEO_START(nbmj9195_2layer)
+ MCFG_VIDEO_UPDATE(nbmj9195)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2963,7 +2963,7 @@ static MACHINE_CONFIG_DERIVED( NBMJDRV2, NBMJDRV1 )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_START(nbmj9195_1layer)
+ MCFG_VIDEO_START(nbmj9195_1layer)
MACHINE_CONFIG_END
@@ -2972,10 +2972,10 @@ static MACHINE_CONFIG_DERIVED( NBMJDRV3, NBMJDRV1 )
/* basic machine hardware */
/* video hardware */
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(nbmj9195_nb22090)
- MDRV_VIDEO_UPDATE(nbmj9195)
+ MCFG_VIDEO_START(nbmj9195_nb22090)
+ MCFG_VIDEO_UPDATE(nbmj9195)
MACHINE_CONFIG_END
@@ -2984,100 +2984,100 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjuraden, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjuraden_map)
- MDRV_CPU_IO_MAP(mjuraden_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjuraden_map)
+ MCFG_CPU_IO_MAP(mjuraden_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( koinomp, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(koinomp_map)
- MDRV_CPU_IO_MAP(koinomp_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(koinomp_map)
+ MCFG_CPU_IO_MAP(koinomp_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( patimono, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(patimono_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(patimono_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( janbari, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(patimono_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(patimono_io_map)
- MDRV_NVRAM_HANDLER(nbmj9195)
+ MCFG_NVRAM_HANDLER(nbmj9195)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mmehyou, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(koinomp_map)
- MDRV_CPU_IO_MAP(mmehyou_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(koinomp_map)
+ MCFG_CPU_IO_MAP(mmehyou_io_map)
- MDRV_NVRAM_HANDLER(nbmj9195)
+ MCFG_NVRAM_HANDLER(nbmj9195)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ultramhm, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(koinomp_map)
- MDRV_CPU_IO_MAP(koinomp_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(koinomp_map)
+ MCFG_CPU_IO_MAP(koinomp_io_map)
- MDRV_NVRAM_HANDLER(nbmj9195)
+ MCFG_NVRAM_HANDLER(nbmj9195)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gal10ren, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(gal10ren_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(gal10ren_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( renaiclb, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(renaiclb_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(renaiclb_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjlaman, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjlaman_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(mjlaman_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mkeibaou, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mkeibaou_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(mkeibaou_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pachiten, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(pachiten_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(pachiten_io_map)
- MDRV_NVRAM_HANDLER(nbmj9195)
+ MCFG_NVRAM_HANDLER(nbmj9195)
MACHINE_CONFIG_END
@@ -3090,131 +3090,131 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sailorwr, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(sailorwr_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(sailorwr_io_map)
- MDRV_NVRAM_HANDLER(nbmj9195)
+ MCFG_NVRAM_HANDLER(nbmj9195)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psailor1, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(psailor1_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(psailor1_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psailor2, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(psailor2_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(psailor2_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( otatidai, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(otatidai_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(otatidai_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yosimoto, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(yosimoto_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(yosimoto_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jituroku, NBMJDRV1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(jituroku_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(jituroku_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ngpgal, NBMJDRV2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ngpgal_map)
- MDRV_CPU_IO_MAP(ngpgal_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ngpgal_map)
+ MCFG_CPU_IO_MAP(ngpgal_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjgottsu, NBMJDRV2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ngpgal_map)
- MDRV_CPU_IO_MAP(mjgottsu_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ngpgal_map)
+ MCFG_CPU_IO_MAP(mjgottsu_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bakuhatu, NBMJDRV2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ngpgal_map)
- MDRV_CPU_IO_MAP(mjgottsu_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ngpgal_map)
+ MCFG_CPU_IO_MAP(mjgottsu_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cmehyou, NBMJDRV2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ngpgal_map)
- MDRV_CPU_IO_MAP(cmehyou_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ngpgal_map)
+ MCFG_CPU_IO_MAP(cmehyou_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjkoiura, NBMJDRV2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjuraden_map)
- MDRV_CPU_IO_MAP(mjkoiura_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjuraden_map)
+ MCFG_CPU_IO_MAP(mjkoiura_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mkoiuraa, NBMJDRV2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjuraden_map)
- MDRV_CPU_IO_MAP(mkoiuraa_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjuraden_map)
+ MCFG_CPU_IO_MAP(mkoiuraa_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mscoutm, NBMJDRV3 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mscoutm_map)
- MDRV_CPU_IO_MAP(mscoutm_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mscoutm_map)
+ MCFG_CPU_IO_MAP(mscoutm_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( imekura, NBMJDRV3 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjegolf_map)
- MDRV_CPU_IO_MAP(imekura_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjegolf_map)
+ MCFG_CPU_IO_MAP(imekura_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjegolf, NBMJDRV3 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjegolf_map)
- MDRV_CPU_IO_MAP(mjegolf_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjegolf_map)
+ MCFG_CPU_IO_MAP(mjegolf_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 5ee63309e3f..6c2fb590256 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -1685,428 +1685,428 @@ static MACHINE_RESET( nemesis )
static MACHINE_CONFIG_START( nemesis, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
// 14318180/2, /* From schematics, should be accurate */
- MDRV_CPU_PROGRAM_MAP(nemesis_map)
- MDRV_CPU_VBLANK_INT("screen", nemesis_interrupt)
+ MCFG_CPU_PROGRAM_MAP(nemesis_map)
+ MCFG_CPU_VBLANK_INT("screen", nemesis_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* From schematics, should be accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map) /* fixed */
+ MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* From schematics, should be accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map) /* fixed */
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* ??? */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* ??? */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* verified with OST */
+ MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* verified with OST */
- MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_2) /* fixed */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
+ MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_2) /* fixed */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
- MDRV_SOUND_ADD("k007232", K005289, 3579545/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
+ MCFG_SOUND_ADD("k007232", K005289, 3579545/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
- MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) /* unused */
+ MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) /* unused */
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gx400, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MDRV_CPU_PROGRAM_MAP(gx400_map)
- MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
+ MCFG_CPU_PROGRAM_MAP(gx400_map)
+ MCFG_CPU_VBLANK_INT_HACK(gx400_interrupt,3)
- MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(gx400_sound_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* interrupts are triggered by the main CPU */
+ MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(gx400_sound_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) /* interrupts are triggered by the main CPU */
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* verified with OST */
+ MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /* verified with OST */
- MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
+ MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
- MDRV_SOUND_ADD("k007232", K005289, 3579545/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
+ MCFG_SOUND_ADD("k007232", K005289, 3579545/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
- MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) /* unused */
+ MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) /* unused */
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( konamigt, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MDRV_CPU_PROGRAM_MAP(konamigt_map)
- MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_CPU_PROGRAM_MAP(konamigt_map)
+ MCFG_CPU_VBLANK_INT_HACK(konamigt_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
+ MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
- MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("k007232", K005289, 3579545/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("k007232", K005289, 3579545/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rf2_gx400, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MDRV_CPU_PROGRAM_MAP(rf2_gx400_map)
- MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
+ MCFG_CPU_PROGRAM_MAP(rf2_gx400_map)
+ MCFG_CPU_VBLANK_INT_HACK(gx400_interrupt,3)
- MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(gx400_sound_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* interrupts are triggered by the main CPU */
+ MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(gx400_sound_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) /* interrupts are triggered by the main CPU */
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
+ MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
- MDRV_SOUND_ADD("ay2", AY8910, 14318180/8)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("k007232", K005289, 3579545/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("k007232", K005289, 3579545/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( salamand, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MDRV_CPU_PROGRAM_MAP(salamand_map)
- MDRV_CPU_VBLANK_INT("screen", salamand_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
+ MCFG_CPU_PROGRAM_MAP(salamand_map)
+ MCFG_CPU_VBLANK_INT("screen", salamand_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sal_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(sal_sound_map)
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((264-256)*125/2))
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((264-256)*125/2))
+ 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)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
-
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.10)
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.10)
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( blkpnthr, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MDRV_CPU_PROGRAM_MAP(blkpnthr_map)
- MDRV_CPU_VBLANK_INT("screen", blkpnthr_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_CPU_PROGRAM_MAP(blkpnthr_map)
+ MCFG_CPU_VBLANK_INT("screen", blkpnthr_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(blkpnthr_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(blkpnthr_sound_map)
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.10)
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.10)
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( citybomb, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MDRV_CPU_PROGRAM_MAP(citybomb_map)
- MDRV_CPU_VBLANK_INT("screen", salamand_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_CPU_PROGRAM_MAP(citybomb_map)
+ MCFG_CPU_VBLANK_INT("screen", salamand_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(city_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(city_sound_map)
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
-
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("k051649", K051649, 3579545/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.38)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.38)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
+
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("k051649", K051649, 3579545/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.38)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.38)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( nyanpani, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MDRV_CPU_PROGRAM_MAP(nyanpani_map)
- MDRV_CPU_VBLANK_INT("screen", salamand_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_CPU_PROGRAM_MAP(nyanpani_map)
+ MCFG_CPU_VBLANK_INT("screen", salamand_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(city_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(city_sound_map)
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
-
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("k051649", K051649, 3579545/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.38)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.38)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
+
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("k051649", K051649, 3579545/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.38)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.38)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hcrash, nemesis_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,18432000/3) /* 6.144MHz */
- MDRV_CPU_PROGRAM_MAP(hcrash_map)
- MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000,18432000/3) /* 6.144MHz */
+ MCFG_CPU_PROGRAM_MAP(hcrash_map)
+ MCFG_CPU_VBLANK_INT_HACK(konamigt_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sal_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(sal_sound_map)
- MDRV_MACHINE_START(nemesis)
- MDRV_MACHINE_RESET(nemesis)
+ MCFG_MACHINE_START(nemesis)
+ MCFG_MACHINE_RESET(nemesis)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((18432000.0/4)/(288*264)) /* 60.606060 Hz */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(nemesis)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(nemesis)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(nemesis)
- MDRV_VIDEO_UPDATE(nemesis)
+ MCFG_VIDEO_START(nemesis)
+ MCFG_VIDEO_UPDATE(nemesis)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
-
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.10)
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.10)
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 917febdd093..7c8916150f3 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1344,42 +1344,42 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( neogeo, neogeo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, NEOGEO_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, NEOGEO_MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("audiocpu", Z80, NEOGEO_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_IO_MAP(audio_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, NEOGEO_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_IO_MAP(audio_io_map)
- MDRV_WATCHDOG_TIME_INIT(USEC(128762))
+ MCFG_WATCHDOG_TIME_INIT(USEC(128762))
- MDRV_MACHINE_START(neogeo)
- MDRV_MACHINE_RESET(neogeo)
- MDRV_NVRAM_HANDLER(neogeo)
- MDRV_MEMCARD_HANDLER(neogeo)
+ MCFG_MACHINE_START(neogeo)
+ MCFG_MACHINE_RESET(neogeo)
+ MCFG_NVRAM_HANDLER(neogeo)
+ MCFG_MEMCARD_HANDLER(neogeo)
/* video hardware */
- MDRV_VIDEO_START(neogeo)
- MDRV_VIDEO_RESET(neogeo)
- MDRV_VIDEO_UPDATE(neogeo)
- MDRV_DEFAULT_LAYOUT(layout_neogeo)
+ MCFG_VIDEO_START(neogeo)
+ MCFG_VIDEO_RESET(neogeo)
+ MCFG_VIDEO_UPDATE(neogeo)
+ MCFG_DEFAULT_LAYOUT(layout_neogeo)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2610, NEOGEO_YM2610_CLOCK)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, NEOGEO_YM2610_CLOCK)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
/* NEC uPD4990A RTC */
- MDRV_UPD4990A_ADD("upd4990a")
+ MCFG_UPD4990A_ADD("upd4990a")
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c
index 1b2966a61d4..680dda98b6e 100644
--- a/src/mame/drivers/neoprint.c
+++ b/src/mame/drivers/neoprint.c
@@ -355,40 +355,40 @@ static const ym2610_interface ym2610_config =
static MACHINE_CONFIG_START( neoprint, neoprint_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(neoprint_map)
- MDRV_CPU_PERIODIC_INT(irq3_line_hold,45) /* camera / printer irq, unknown timing */
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold) // lv1,2,3 valid?
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(neoprint_map)
+ MCFG_CPU_PERIODIC_INT(irq3_line_hold,45) /* camera / printer irq, unknown timing */
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold) // lv1,2,3 valid?
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(neoprint_audio_map)
- MDRV_CPU_IO_MAP(neoprint_audio_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(neoprint_audio_map)
+ MCFG_CPU_IO_MAP(neoprint_audio_io_map)
- MDRV_UPD4990A_ADD("upd4990a")
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_UPD4990A_ADD("upd4990a")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_GFXDECODE(neoprint)
+ MCFG_GFXDECODE(neoprint)
- 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, 48*8-1, 0*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x10000)
+ MCFG_PALETTE_LENGTH(0x10000)
- MDRV_VIDEO_START(neoprint)
- MDRV_VIDEO_UPDATE(neoprint)
+ MCFG_VIDEO_START(neoprint)
+ MCFG_VIDEO_UPDATE(neoprint)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2610, 24000000 / 3)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 24000000 / 3)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/neptunp2.c b/src/mame/drivers/neptunp2.c
index 0a9267c1e28..cee880469d1 100644
--- a/src/mame/drivers/neptunp2.c
+++ b/src/mame/drivers/neptunp2.c
@@ -69,26 +69,26 @@ GFXDECODE_END
static MACHINE_CONFIG_START( neptunp2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",I80188,20000000) // N80C188-20 AMD
- MDRV_CPU_PROGRAM_MAP(neptunp2_map)
- MDRV_CPU_IO_MAP(neptunp2_io)
-// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",I80188,20000000) // N80C188-20 AMD
+ MCFG_CPU_PROGRAM_MAP(neptunp2_map)
+ MCFG_CPU_IO_MAP(neptunp2_io)
+// MCFG_CPU_VBLANK_INT("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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(neptunp2)
- MDRV_PALETTE_LENGTH(512)
-
- MDRV_VIDEO_START(neptunp2)
- MDRV_VIDEO_UPDATE(neptunp2)
+ 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(neptunp2)
+ MCFG_PALETTE_LENGTH(512)
+
+ MCFG_VIDEO_START(neptunp2)
+ MCFG_VIDEO_UPDATE(neptunp2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index 04c819d2add..c3cdb8a9add 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -130,32 +130,32 @@ static MACHINE_RESET( news )
static MACHINE_CONFIG_START( news, news_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(news_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(news_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(news)
- MDRV_MACHINE_RESET(news)
+ MCFG_MACHINE_START(news)
+ MCFG_MACHINE_RESET(news)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_GFXDECODE(news)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(news)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(news)
- MDRV_VIDEO_UPDATE(news)
+ MCFG_VIDEO_START(news)
+ MCFG_VIDEO_UPDATE(news)
/* 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/nightgal.c b/src/mame/drivers/nightgal.c
index e7bd5aa8de4..f1c53f44c5b 100644
--- a/src/mame/drivers/nightgal.c
+++ b/src/mame/drivers/nightgal.c
@@ -859,66 +859,66 @@ static MACHINE_RESET( nightgal )
static MACHINE_CONFIG_START( royalqn, nightgal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK / 8) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(royalqn_map)
- MDRV_CPU_IO_MAP(royalqn_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK / 8) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(royalqn_map)
+ MCFG_CPU_IO_MAP(royalqn_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", NSC8105, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(royalqn_nsc_map)
+ MCFG_CPU_ADD("sub", NSC8105, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(royalqn_nsc_map)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(nightgal)
- MDRV_MACHINE_RESET(nightgal)
+ MCFG_MACHINE_START(nightgal)
+ MCFG_MACHINE_RESET(nightgal)
/* video hardware */
/* TODO: blitter clock is MASTER_CLOCK / 4, 320 x 264 pixels, 256 x 224 of visible area */
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
- MDRV_PALETTE_INIT(nightgal)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
+ MCFG_PALETTE_INIT(nightgal)
- MDRV_PALETTE_LENGTH(0x10)
+ MCFG_PALETTE_LENGTH(0x10)
- MDRV_VIDEO_START(nightgal)
- MDRV_VIDEO_UPDATE(nightgal)
+ MCFG_VIDEO_START(nightgal)
+ MCFG_VIDEO_UPDATE(nightgal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sexygal, royalqn )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sexygal_map)
- MDRV_CPU_IO_MAP(sexygal_io)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,244)//???
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sexygal_map)
+ MCFG_CPU_IO_MAP(sexygal_io)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,244)//???
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(sexygal_nsc_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(sexygal_nsc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_DEVICE_REMOVE("aysnd")
+ MCFG_DEVICE_REMOVE("aysnd")
- MDRV_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ngalsumr, royalqn )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(royalqn_map)
- MDRV_CPU_IO_MAP(royalqn_io)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,244)//???
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(royalqn_map)
+ MCFG_CPU_IO_MAP(royalqn_io)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,244)//???
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 90519185c5f..689fe5f93c6 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -908,108 +908,108 @@ static const samples_interface ninjakd2_samples_interface =
static MACHINE_CONFIG_START( ninjakd2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK_12/2) /* verified */
- MDRV_CPU_PROGRAM_MAP(ninjakd2_main_cpu)
- MDRV_CPU_VBLANK_INT("screen", ninjakd2_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK_12/2) /* verified */
+ MCFG_CPU_PROGRAM_MAP(ninjakd2_main_cpu)
+ MCFG_CPU_VBLANK_INT("screen", ninjakd2_interrupt)
- MDRV_CPU_ADD("soundcpu", Z80, MAIN_CLOCK_5) /* verified */
- MDRV_CPU_PROGRAM_MAP(ninjakd2_sound_cpu)
- MDRV_CPU_IO_MAP(ninjakd2_sound_io)
+ MCFG_CPU_ADD("soundcpu", Z80, MAIN_CLOCK_5) /* verified */
+ MCFG_CPU_PROGRAM_MAP(ninjakd2_sound_cpu)
+ MCFG_CPU_IO_MAP(ninjakd2_sound_io)
- MDRV_MACHINE_RESET(ninjakd2)
+ MCFG_MACHINE_RESET(ninjakd2)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.61) /* verified on pcb */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.61) /* verified on pcb */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(ninjakd2)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_GFXDECODE(ninjakd2)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_VIDEO_START(ninjakd2)
- MDRV_VIDEO_UPDATE(ninjakd2)
- MDRV_VIDEO_EOF(ninjakd2)
+ MCFG_VIDEO_START(ninjakd2)
+ MCFG_VIDEO_UPDATE(ninjakd2)
+ MCFG_VIDEO_EOF(ninjakd2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("2203.1", YM2203, MAIN_CLOCK_12/8) /* verified */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
-
- MDRV_SOUND_ADD("2203.2", YM2203, MAIN_CLOCK_12/8) /* verified */
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
-
- MDRV_SOUND_ADD("pcm", SAMPLES, 0)
- MDRV_SOUND_CONFIG(ninjakd2_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("2203.1", YM2203, MAIN_CLOCK_12/8) /* verified */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
+
+ MCFG_SOUND_ADD("2203.2", YM2203, MAIN_CLOCK_12/8) /* verified */
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
+
+ MCFG_SOUND_ADD("pcm", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(ninjakd2_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mnight, ninjakd2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mnight_main_cpu)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mnight_main_cpu)
/* video hardware */
- MDRV_VIDEO_START(mnight)
+ MCFG_VIDEO_START(mnight)
/* sound hardware */
- MDRV_DEVICE_REMOVE("pcm")
+ MCFG_DEVICE_REMOVE("pcm")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( arkarea, ninjakd2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mnight_main_cpu)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mnight_main_cpu)
/* video hardware */
- MDRV_VIDEO_START(arkarea)
+ MCFG_VIDEO_START(arkarea)
/* sound hardware */
- MDRV_DEVICE_REMOVE("pcm")
+ MCFG_DEVICE_REMOVE("pcm")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( robokid, mnight )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(robokid_main_cpu)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(robokid_main_cpu)
- MDRV_MACHINE_RESET(robokid)
+ MCFG_MACHINE_RESET(robokid)
/* video hardware */
- MDRV_GFXDECODE(robokid)
- MDRV_PALETTE_LENGTH(0x400) // RAM is this large, but still only 0x300 colors used
+ MCFG_GFXDECODE(robokid)
+ MCFG_PALETTE_LENGTH(0x400) // RAM is this large, but still only 0x300 colors used
- MDRV_VIDEO_START(robokid)
- MDRV_VIDEO_UPDATE(robokid)
+ MCFG_VIDEO_START(robokid)
+ MCFG_VIDEO_UPDATE(robokid)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( omegaf, robokid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(omegaf_main_cpu)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(omegaf_main_cpu)
- MDRV_MACHINE_RESET(omegaf)
+ MCFG_MACHINE_RESET(omegaf)
/* video hardware */
- MDRV_VIDEO_START(omegaf)
- MDRV_VIDEO_UPDATE(omegaf)
+ MCFG_VIDEO_START(omegaf)
+ MCFG_VIDEO_UPDATE(omegaf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 0b64bffa595..db531c09508 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -800,168 +800,168 @@ static MACHINE_RESET( ninjaw )
static MACHINE_CONFIG_START( ninjaw, ninjaw_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ninjaw_master_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(ninjaw_master_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 16/4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ninjaw_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 16/4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(ninjaw_sound_map)
- MDRV_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ninjaw_slave_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(ninjaw_slave_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq4_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* CPU slices */
- MDRV_MACHINE_START(ninjaw)
- MDRV_MACHINE_RESET(ninjaw)
+ MCFG_MACHINE_START(ninjaw)
+ MCFG_MACHINE_RESET(ninjaw)
- MDRV_TC0220IOC_ADD("tc0220ioc", ninjaw_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", ninjaw_io_intf)
/* video hardware */
- MDRV_GFXDECODE(ninjaw)
- MDRV_PALETTE_LENGTH(4096*3)
- MDRV_DEFAULT_LAYOUT(layout_darius)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
-
- MDRV_SCREEN_ADD("mscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
-
- MDRV_VIDEO_START(ninjaw)
- MDRV_VIDEO_UPDATE(ninjaw)
-
- MDRV_TC0100SCN_ADD("tc0100scn_1", darius2_tc0100scn_intf_l)
- MDRV_TC0100SCN_ADD("tc0100scn_2", darius2_tc0100scn_intf_m)
- MDRV_TC0100SCN_ADD("tc0100scn_3", darius2_tc0100scn_intf_r)
- MDRV_TC0110PCR_ADD("tc0110pcr_1", darius2_tc0110pcr_intf_l)
- MDRV_TC0110PCR_ADD("tc0110pcr_2", darius2_tc0110pcr_intf_m)
- MDRV_TC0110PCR_ADD("tc0110pcr_3", darius2_tc0110pcr_intf_r)
+ MCFG_GFXDECODE(ninjaw)
+ MCFG_PALETTE_LENGTH(4096*3)
+ MCFG_DEFAULT_LAYOUT(layout_darius)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
+
+ MCFG_SCREEN_ADD("mscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
+
+ MCFG_VIDEO_START(ninjaw)
+ MCFG_VIDEO_UPDATE(ninjaw)
+
+ MCFG_TC0100SCN_ADD("tc0100scn_1", darius2_tc0100scn_intf_l)
+ MCFG_TC0100SCN_ADD("tc0100scn_2", darius2_tc0100scn_intf_m)
+ MCFG_TC0100SCN_ADD("tc0100scn_3", darius2_tc0100scn_intf_r)
+ MCFG_TC0110PCR_ADD("tc0110pcr_1", darius2_tc0110pcr_intf_l)
+ MCFG_TC0110PCR_ADD("tc0110pcr_2", darius2_tc0110pcr_intf_m)
+ MCFG_TC0110PCR_ADD("tc0110pcr_3", darius2_tc0110pcr_intf_r)
/* sound hardware */
- 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, "2610.1.l", 1.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
-
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
-// MDRV_SOUND_ADD("subwoofer", SUBWOOFER, 0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", ninjaw_tc0140syt_intf)
+ 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, "2610.1.l", 1.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 1.0)
+
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+// MCFG_SOUND_ADD("subwoofer", SUBWOOFER, 0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", ninjaw_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( darius2, ninjaw_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius2_master_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(darius2_master_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ninjaw_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(ninjaw_sound_map)
- MDRV_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(darius2_slave_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(darius2_slave_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq4_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* CPU slices */
- MDRV_MACHINE_START(ninjaw)
- MDRV_MACHINE_RESET(ninjaw)
+ MCFG_MACHINE_START(ninjaw)
+ MCFG_MACHINE_RESET(ninjaw)
- MDRV_TC0220IOC_ADD("tc0220ioc", ninjaw_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", ninjaw_io_intf)
/* video hardware */
- MDRV_GFXDECODE(ninjaw)
- MDRV_PALETTE_LENGTH(4096*3)
- MDRV_DEFAULT_LAYOUT(layout_darius)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
-
- MDRV_SCREEN_ADD("mscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
-
- MDRV_VIDEO_START(ninjaw)
- MDRV_VIDEO_UPDATE(ninjaw)
-
- MDRV_TC0100SCN_ADD("tc0100scn_1", darius2_tc0100scn_intf_l)
- MDRV_TC0100SCN_ADD("tc0100scn_2", darius2_tc0100scn_intf_m)
- MDRV_TC0100SCN_ADD("tc0100scn_3", darius2_tc0100scn_intf_r)
- MDRV_TC0110PCR_ADD("tc0110pcr_1", darius2_tc0110pcr_intf_l)
- MDRV_TC0110PCR_ADD("tc0110pcr_2", darius2_tc0110pcr_intf_m)
- MDRV_TC0110PCR_ADD("tc0110pcr_3", darius2_tc0110pcr_intf_r)
+ MCFG_GFXDECODE(ninjaw)
+ MCFG_PALETTE_LENGTH(4096*3)
+ MCFG_DEFAULT_LAYOUT(layout_darius)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
+
+ MCFG_SCREEN_ADD("mscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1)
+
+ MCFG_VIDEO_START(ninjaw)
+ MCFG_VIDEO_UPDATE(ninjaw)
+
+ MCFG_TC0100SCN_ADD("tc0100scn_1", darius2_tc0100scn_intf_l)
+ MCFG_TC0100SCN_ADD("tc0100scn_2", darius2_tc0100scn_intf_m)
+ MCFG_TC0100SCN_ADD("tc0100scn_3", darius2_tc0100scn_intf_r)
+ MCFG_TC0110PCR_ADD("tc0110pcr_1", darius2_tc0110pcr_intf_l)
+ MCFG_TC0110PCR_ADD("tc0110pcr_2", darius2_tc0110pcr_intf_m)
+ MCFG_TC0110PCR_ADD("tc0110pcr_3", darius2_tc0110pcr_intf_r)
/* sound hardware */
- 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, "2610.1.l", 1.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
-
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
-// MDRV_SOUND_ADD("subwoofer", SUBWOOFER, 0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", ninjaw_tc0140syt_intf)
+ 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, "2610.1.l", 1.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 1.0)
+
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+// MCFG_SOUND_ADD("subwoofer", SUBWOOFER, 0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", ninjaw_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index 44afc7b4e59..e37258fa376 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -137,37 +137,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( nitedrvr, nitedrvr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, XTAL_12_096MHz/12) // 1 MHz
- MDRV_CPU_PROGRAM_MAP(nitedrvr_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_WATCHDOG_VBLANK_INIT(3)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz/12) // 1 MHz
+ MCFG_CPU_PROGRAM_MAP(nitedrvr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_WATCHDOG_VBLANK_INIT(3)
- MDRV_MACHINE_START(nitedrvr)
- MDRV_MACHINE_RESET(nitedrvr)
+ MCFG_MACHINE_START(nitedrvr)
+ MCFG_MACHINE_RESET(nitedrvr)
- MDRV_TIMER_ADD_PERIODIC("crash_timer", nitedrvr_crash_toggle_callback, NSEC(PERIOD_OF_555_ASTABLE_NSEC(RES_K(180), 330, CAP_U(1))))
+ MCFG_TIMER_ADD_PERIODIC("crash_timer", nitedrvr_crash_toggle_callback, NSEC(PERIOD_OF_555_ASTABLE_NSEC(RES_K(180), 330, CAP_U(1))))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57) // how is this derived?
- 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(0*8, 32*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57) // how is this derived?
+ 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(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(nitedrvr)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(nitedrvr)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(nitedrvr)
- MDRV_VIDEO_UPDATE(nitedrvr)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(nitedrvr)
+ MCFG_VIDEO_UPDATE(nitedrvr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(nitedrvr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(nitedrvr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index e7ba2947e99..1e3945a94a9 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -768,58 +768,58 @@ static const z80_daisy_config daisy_chain_sound[] =
static MACHINE_CONFIG_START( niyanpai, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12288000/2) /* TMP68301, 6.144 MHz */
- MDRV_CPU_PROGRAM_MAP(niyanpai_map)
- MDRV_CPU_VBLANK_INT("screen", niyanpai_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12288000/2) /* TMP68301, 6.144 MHz */
+ MCFG_CPU_PROGRAM_MAP(niyanpai_map)
+ MCFG_CPU_VBLANK_INT("screen", niyanpai_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* TMPZ84C011, 8.00 MHz */
- MDRV_CPU_CONFIG(daisy_chain_sound)
- MDRV_CPU_PROGRAM_MAP(niyanpai_sound_map)
- MDRV_CPU_IO_MAP(niyanpai_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* TMPZ84C011, 8.00 MHz */
+ MCFG_CPU_CONFIG(daisy_chain_sound)
+ MCFG_CPU_PROGRAM_MAP(niyanpai_sound_map)
+ MCFG_CPU_IO_MAP(niyanpai_sound_io_map)
- MDRV_Z80CTC_ADD("ctc", 8000000 /* same as "audiocpu" */, ctc_intf)
+ MCFG_Z80CTC_ADD("ctc", 8000000 /* same as "audiocpu" */, ctc_intf)
- MDRV_MACHINE_RESET(niyanpai)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(niyanpai)
+ 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(1024, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-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(1024, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(niyanpai)
- MDRV_VIDEO_UPDATE(niyanpai)
+ MCFG_VIDEO_START(niyanpai)
+ MCFG_VIDEO_UPDATE(niyanpai)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( musobana, niyanpai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(musobana_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(musobana_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mhhonban, niyanpai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mhhonban_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mhhonban_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 08caa64119f..d2c5b8af09c 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -1033,51 +1033,51 @@ static MACHINE_RESET( nmg5 )
static MACHINE_CONFIG_START( nmg5, nmg5_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(nmg5_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(nmg5_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(nmg5_sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(nmg5_sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_MACHINE_START(nmg5)
- MDRV_MACHINE_RESET(nmg5)
+ MCFG_MACHINE_START(nmg5)
+ MCFG_MACHINE_RESET(nmg5)
/* 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(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(nmg5)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(nmg5)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(nmg5)
- MDRV_VIDEO_UPDATE(nmg5)
+ MCFG_VIDEO_START(nmg5)
+ MCFG_VIDEO_UPDATE(nmg5)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000) /* 4MHz */
- MDRV_SOUND_CONFIG(ym3812_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000) /* 4MHz */
+ MCFG_SOUND_CONFIG(ym3812_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 1000000 , OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000 , OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( garogun, nmg5 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pclubys_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(pclubys_sound_map)
MACHINE_CONFIG_END
@@ -1085,31 +1085,31 @@ static MACHINE_CONFIG_DERIVED( pclubys, nmg5 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pclubys_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(pclubys_sound_map)
- MDRV_GFXDECODE(pclubys)
+ MCFG_GFXDECODE(pclubys)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( searchp2, nmg5 )
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(55) // !
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(55) // !
- MDRV_GFXDECODE(pclubys)
+ MCFG_GFXDECODE(pclubys)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( 7ordi, nmg5 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(pclubys_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(pclubys_sound_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index c4835d91c76..9ac4b1022c8 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -3552,162 +3552,162 @@ static const nmk112_interface nmk16_nmk112_intf =
static MACHINE_CONFIG_START( tharrier, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(tharrier_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(tharrier_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000)
- MDRV_CPU_PROGRAM_MAP(tharrier_sound_map)
- MDRV_CPU_IO_MAP(tharrier_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000)
+ MCFG_CPU_PROGRAM_MAP(tharrier_sound_map)
+ MCFG_CPU_IO_MAP(tharrier_sound_io_map)
- MDRV_MACHINE_RESET(mustang_sound)
+ MCFG_MACHINE_RESET(mustang_sound)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(tharrier)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(tharrier)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(tharrier)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(tharrier)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( manybloc, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10? MHz - check */
- MDRV_CPU_PROGRAM_MAP(manybloc_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,56)/* this needs to equal the framerate on this, rather than being double it .. */
- MDRV_TIMER_ADD_SCANLINE("scantimer", manybloc_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10? MHz - check */
+ MCFG_CPU_PROGRAM_MAP(manybloc_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,56)/* this needs to equal the framerate on this, rather than being double it .. */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", manybloc_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000)
- MDRV_CPU_PROGRAM_MAP(tharrier_sound_map)
- MDRV_CPU_IO_MAP(tharrier_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000)
+ MCFG_CPU_PROGRAM_MAP(tharrier_sound_map)
+ MCFG_CPU_IO_MAP(tharrier_sound_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tharrier)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(tharrier)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(manybloc)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(manybloc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mustang, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mustang_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(mustang_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mustangb, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mustangb_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(mustangb_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(mustang_sound)
+ MCFG_MACHINE_RESET(mustang_sound)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4, 1320000)
@@ -3720,192 +3720,192 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bioship, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */
- MDRV_CPU_PROGRAM_MAP(bioship_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,100)/* 112 breaks the title screen */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */
+ MCFG_CPU_PROGRAM_MAP(bioship_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,100)/* 112 breaks the title screen */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(bioship)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(bioship)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(bioship)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(bioship)
+ MCFG_VIDEO_START(bioship)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(bioship)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", BIOSHIP_CRYSTAL2 / 3 , OKIM6295_PIN7_HIGH) /* 4.0 Mhz, Pin 7 High (verified) */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", BIOSHIP_CRYSTAL2 / 3 , OKIM6295_PIN7_HIGH) /* 4.0 Mhz, Pin 7 High (verified) */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", BIOSHIP_CRYSTAL2 / 3 , OKIM6295_PIN7_HIGH) /* 4.0 Mhz, Pin 7 High (verified) */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", BIOSHIP_CRYSTAL2 / 3 , OKIM6295_PIN7_HIGH) /* 4.0 Mhz, Pin 7 High (verified) */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( vandyke, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(vandyke_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(vandyke_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", XTAL_12MHz/3, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/3, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", XTAL_12MHz/3, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/3, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( vandykeb, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(vandykeb_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(vandykeb_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("mcu", PIC16C57, 12000000) /* 3MHz */
- MDRV_DEVICE_DISABLE()
+ MCFG_CPU_ADD("mcu", PIC16C57, 12000000) /* 3MHz */
+ MCFG_DEVICE_DISABLE()
- //MDRV_MACHINE_RESET(NMK004) // no NMK004
+ //MCFG_MACHINE_RESET(NMK004) // no NMK004
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( acrobatm, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz (verified on pcb) */
- MDRV_CPU_PROGRAM_MAP(acrobatm_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz (verified on pcb) */
+ MCFG_CPU_PROGRAM_MAP(acrobatm_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000) /* (verified on pcb) */
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000) /* (verified on pcb) */
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tdragonb, driver_device ) /* bootleg using Raiden sound hardware */
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(tdragonb_map)
- //MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(tdragonb_map)
+ //MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(mustang_sound)
+ MCFG_MACHINE_RESET(mustang_sound)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4, 1320000)
@@ -3914,454 +3914,454 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tdragon, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tdragon_map)
- //MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tdragon_map)
+ //MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(tdragon)
- MDRV_TIMER_ADD_PERIODIC("coinsim", tdragon_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(tdragon)
+ MCFG_TIMER_ADD_PERIODIC("coinsim", tdragon_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ssmissin, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz */
- MDRV_CPU_PROGRAM_MAP(ssmissin_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112) /* input related */
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz */
+ MCFG_CPU_PROGRAM_MAP(ssmissin_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112) /* input related */
- MDRV_CPU_ADD("audiocpu", Z80, 8000000/2) /* 4 Mhz */
- MDRV_CPU_PROGRAM_MAP(ssmissin_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000/2) /* 4 Mhz */
+ MCFG_CPU_PROGRAM_MAP(ssmissin_sound_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 8000000/8, OKIM6295_PIN7_HIGH) /* 1 Mhz, pin 7 high */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 8000000/8, OKIM6295_PIN7_HIGH) /* 1 Mhz, pin 7 high */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", nmk16_nmk112_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( strahl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ? */
- MDRV_CPU_PROGRAM_MAP(strahl_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(strahl_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(strahl)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(strahl)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(strahl)
- MDRV_VIDEO_EOF(strahl)
- MDRV_VIDEO_UPDATE(strahl)
+ MCFG_VIDEO_START(strahl)
+ MCFG_VIDEO_EOF(strahl)
+ MCFG_VIDEO_UPDATE(strahl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hachamf, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(hachamf_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(hachamf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(hachamf)
- MDRV_TIMER_ADD_PERIODIC("coinsim", hachamf_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(hachamf)
+ MCFG_TIMER_ADD_PERIODIC("coinsim", hachamf_mcu_sim, HZ(10000)) // not real, but for simulating the MCU
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( macross, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(macross_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(macross_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( blkheart, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(macross_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(macross_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56.18) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56.18) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8 ) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8 ) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gunnail, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz? */
- MDRV_CPU_PROGRAM_MAP(gunnail_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz? */
+ MCFG_CPU_PROGRAM_MAP(gunnail_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)
- MDRV_MACHINE_RESET(NMK004)
+ MCFG_MACHINE_RESET(NMK004)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
-// 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*8, 48*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+// 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*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(gunnail)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(gunnail)
+ MCFG_VIDEO_START(gunnail)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(gunnail)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 2.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_nmk004_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( macross2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MDRV_CPU_PROGRAM_MAP(macross2_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(macross2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(macross2_sound_map)
- MDRV_CPU_IO_MAP(macross2_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(macross2_sound_map)
+ MCFG_CPU_IO_MAP(macross2_sound_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- 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*8, 48*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ 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*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross2)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross2)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross2)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(gunnail)
+ MCFG_VIDEO_START(macross2)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(gunnail)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", nmk16_nmk112_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tdragon2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(macross2_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(macross2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(macross2_sound_map)
- MDRV_CPU_IO_MAP(macross2_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(macross2_sound_map)
+ MCFG_CPU_IO_MAP(macross2_sound_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- 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*8, 48*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ 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*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross2)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross2)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross2)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(gunnail)
+ MCFG_VIDEO_START(macross2)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(gunnail)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.08)
- MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", nmk16_nmk112_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( raphero, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000) /* 14 MHz measured */
- MDRV_CPU_PROGRAM_MAP(raphero_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 14 MHz measured */
+ MCFG_CPU_PROGRAM_MAP(raphero_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_CPU_ADD("audiocpu",TMP90841, 8000000)
- MDRV_CPU_PROGRAM_MAP(raphero_sound_mem_map)
+ MCFG_CPU_ADD("audiocpu",TMP90841, 8000000)
+ MCFG_CPU_PROGRAM_MAP(raphero_sound_mem_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56) // measured
- 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*8, 48*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56) // measured
+ 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*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross2)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross2)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(raphero)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(gunnail)
+ MCFG_VIDEO_START(raphero)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(gunnail)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", nmk16_nmk112_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bjtwin, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bjtwin_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(bjtwin_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- 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*8, 48*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ 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*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(bjtwin)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(bjtwin)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(bjtwin)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(bjtwin)
+ MCFG_VIDEO_START(bjtwin)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(bjtwin)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_NMK112_ADD("nmk112", nmk16_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", nmk16_nmk112_intf)
MACHINE_CONFIG_END
@@ -4838,54 +4838,54 @@ static const ym2151_interface afega_ym2151_intf =
static MACHINE_CONFIG_START( stagger1, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(afega)
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(afega)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(afega_sound_cpu)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(afega_sound_cpu)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(stagger1)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(stagger1)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(afega)
- MDRV_VIDEO_UPDATE(afega)
- MDRV_VIDEO_EOF(nmk)
+ MCFG_VIDEO_START(afega)
+ MCFG_VIDEO_UPDATE(afega)
+ MCFG_VIDEO_EOF(nmk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_4MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(afega_ym2151_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_4MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(afega_ym2151_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
- MDRV_OKIM6295_ADD("oki1", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70)
+ MCFG_OKIM6295_ADD("oki1", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( redhawki, stagger1 )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_UPDATE(redhawki)
+ MCFG_VIDEO_UPDATE(redhawki)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( redhawkb, stagger1 )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(redhawkb)
- MDRV_VIDEO_UPDATE(redhawkb)
+ MCFG_GFXDECODE(redhawkb)
+ MCFG_VIDEO_UPDATE(redhawkb)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( grdnstrm, stagger1 )
@@ -4893,9 +4893,9 @@ static MACHINE_CONFIG_DERIVED( grdnstrm, stagger1 )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(grdnstrm)
- MDRV_VIDEO_START(firehawk)
- MDRV_VIDEO_UPDATE(firehawk)
+ MCFG_GFXDECODE(grdnstrm)
+ MCFG_VIDEO_START(firehawk)
+ MCFG_VIDEO_UPDATE(firehawk)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( grdnstrmk, stagger1 )
@@ -4903,8 +4903,8 @@ static MACHINE_CONFIG_DERIVED( grdnstrmk, stagger1 )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(grdnstrm)
- MDRV_VIDEO_START(grdnstrm)
+ MCFG_GFXDECODE(grdnstrm)
+ MCFG_VIDEO_START(grdnstrm)
MACHINE_CONFIG_END
@@ -4913,76 +4913,76 @@ static MACHINE_CONFIG_DERIVED( popspops, grdnstrm )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_UPDATE(bubl2000)
+ MCFG_VIDEO_UPDATE(bubl2000)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( firehawk, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(afega)
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000,12000000)
+ MCFG_CPU_PROGRAM_MAP(afega)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80,4000000)
- MDRV_CPU_PROGRAM_MAP(firehawk_sound_cpu)
+ MCFG_CPU_ADD("audiocpu", Z80,4000000)
+ MCFG_CPU_PROGRAM_MAP(firehawk_sound_cpu)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(grdnstrm)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(grdnstrm)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(firehawk)
- MDRV_VIDEO_UPDATE(firehawk)
- MDRV_VIDEO_EOF(nmk)
+ MCFG_VIDEO_START(firehawk)
+ MCFG_VIDEO_UPDATE(firehawk)
+ MCFG_VIDEO_EOF(nmk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( twinactn, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(twinactn_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
- MDRV_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000,12000000)
+ MCFG_CPU_PROGRAM_MAP(twinactn_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
+ MCFG_TIMER_ADD_SCANLINE("scantimer", nmk16_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(twinactn_sound_cpu)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(twinactn_sound_cpu)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(macross)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(macross)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(macross)
- MDRV_VIDEO_EOF(nmk)
- MDRV_VIDEO_UPDATE(macross)
+ MCFG_VIDEO_START(macross)
+ MCFG_VIDEO_EOF(nmk)
+ MCFG_VIDEO_UPDATE(macross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index 083319f45f1..d6fe4cf640b 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -1239,84 +1239,84 @@ static I8255A_INTERFACE (ppi8255_intf_1)
static MACHINE_CONFIG_START( noraut_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, NORAUT_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(norautp_map)
- MDRV_CPU_IO_MAP(norautp_portmap)
+ MCFG_CPU_ADD("maincpu", Z80, NORAUT_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(norautp_map)
+ MCFG_CPU_IO_MAP(norautp_portmap)
- MDRV_NVRAM_ADD_0FILL("nvram") /* doesn't work if placed at derivative drivers */
+ MCFG_NVRAM_ADD_0FILL("nvram") /* doesn't work if placed at derivative drivers */
/* 3x 8255 */
- MDRV_I8255A_ADD( "ppi8255_0", ppi8255_intf_0 )
- MDRV_I8255A_ADD( "ppi8255_1", ppi8255_intf_1 )
-// MDRV_I8255A_ADD( "ppi8255_2", ppi8255_intf_2 )
+ MCFG_I8255A_ADD( "ppi8255_0", ppi8255_intf_0 )
+ MCFG_I8255A_ADD( "ppi8255_1", ppi8255_intf_1 )
+// MCFG_I8255A_ADD( "ppi8255_2", ppi8255_intf_2 )
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(2*16, 31*16-1, (0*16) + 8, 16*16-1) /* the hardware clips the top 8 pixels */
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(2*16, 31*16-1, (0*16) + 8, 16*16-1) /* the hardware clips the top 8 pixels */
- MDRV_GFXDECODE(norautp)
+ MCFG_GFXDECODE(norautp)
- MDRV_PALETTE_INIT(norautp)
- MDRV_PALETTE_LENGTH(8)
- MDRV_VIDEO_START(norautp)
- MDRV_VIDEO_UPDATE(norautp)
+ MCFG_PALETTE_INIT(norautp)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_VIDEO_START(norautp)
+ MCFG_VIDEO_UPDATE(norautp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(norautp)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(norautp)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( norautp, noraut_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( norautpl, noraut_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* sound hardware */
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(kimble)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(kimble)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( norautxp, noraut_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(norautxp_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(norautxp_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nortest1, noraut_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nortest1_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(nortest1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( norautx4, noraut_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(norautx4_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(norautx4_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
@@ -1324,9 +1324,9 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( norautx8, noraut_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(norautx8_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(norautx8_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
#endif
@@ -1334,13 +1334,13 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kimble, noraut_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kimble_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(kimble_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* sound hardware */
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(kimble)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(kimble)
MACHINE_CONFIG_END
@@ -1350,78 +1350,78 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dphl, noraut_base )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dphl_map)
- MDRV_CPU_IO_MAP(norautp_portmap)
+ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(dphl_map)
+ MCFG_CPU_IO_MAP(norautp_portmap)
/* sound hardware */
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(dphl)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(dphl)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dphla, noraut_base )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dphla_map)
- MDRV_CPU_IO_MAP(norautp_portmap)
+ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(dphla_map)
+ MCFG_CPU_IO_MAP(norautp_portmap)
/* sound hardware */
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(dphl)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(dphl)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kimbldhl, noraut_base )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(kimbldhl_map)
- MDRV_CPU_IO_MAP(norautp_portmap)
+ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(kimbldhl_map)
+ MCFG_CPU_IO_MAP(norautp_portmap)
/* sound hardware */
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(kimble)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(kimble)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dphltest, noraut_base )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dphltest_map)
- MDRV_CPU_IO_MAP(norautp_portmap)
+ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(dphltest_map)
+ MCFG_CPU_IO_MAP(norautp_portmap)
/* sound hardware */
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(dphl)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(dphl)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( drhl, noraut_base )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(drhl_map)
- MDRV_CPU_IO_MAP(norautp_portmap)
+ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(drhl_map)
+ MCFG_CPU_IO_MAP(norautp_portmap)
/* sound hardware */
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(dphl)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(dphl)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ssjkrpkr, noraut_base )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ssjkrpkr_map)
- MDRV_CPU_IO_MAP(norautp_portmap)
+ MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(ssjkrpkr_map)
+ MCFG_CPU_IO_MAP(norautp_portmap)
/* sound hardware */
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(dphl)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(dphl)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 6a6f97763c5..4e7c65a74e7 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -683,148 +683,148 @@ static const ay8910_interface pkunwar_ay8910_interface_2 =
static MACHINE_CONFIG_START( nova2001, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics
- MDRV_CPU_PROGRAM_MAP(nova2001_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics
+ MCFG_CPU_PROGRAM_MAP(nova2001_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(nova2001)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(nova2001)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(nova2001)
- MDRV_VIDEO_START(nova2001)
- MDRV_VIDEO_UPDATE(nova2001)
+ MCFG_PALETTE_INIT(nova2001)
+ MCFG_VIDEO_START(nova2001)
+ MCFG_VIDEO_UPDATE(nova2001)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/6) // 2 MHz verified on schematics
- MDRV_SOUND_CONFIG(nova2001_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/6) // 2 MHz verified on schematics
+ MCFG_SOUND_CONFIG(nova2001_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/6)
- MDRV_SOUND_CONFIG(nova2001_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/6)
+ MCFG_SOUND_CONFIG(nova2001_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ninjakun, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(ninjakun_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(ninjakun_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(ninjakun_cpu2_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */
+ MCFG_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(ninjakun_cpu2_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
- MDRV_MACHINE_START(ninjakun)
+ MCFG_MACHINE_START(ninjakun)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1 )
- MDRV_GFXDECODE(ninjakun)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_GFXDECODE(ninjakun)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_VIDEO_START(ninjakun)
- MDRV_VIDEO_UPDATE(ninjakun)
+ MCFG_VIDEO_START(ninjakun)
+ MCFG_VIDEO_UPDATE(ninjakun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/4) // 3 MHz
- MDRV_SOUND_CONFIG(nova2001_ay8910_interface_2) // note swapped order wrt nova2001
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/4) // 3 MHz
+ MCFG_SOUND_CONFIG(nova2001_ay8910_interface_2) // note swapped order wrt nova2001
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/4) // 3 MHz
- MDRV_SOUND_CONFIG(nova2001_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/4) // 3 MHz
+ MCFG_SOUND_CONFIG(nova2001_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pkunwar, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(pkunwar_map)
- MDRV_CPU_IO_MAP(pkunwar_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(pkunwar_map)
+ MCFG_CPU_IO_MAP(pkunwar_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(pkunwar)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(pkunwar)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(nova2001)
- MDRV_VIDEO_START(pkunwar)
- MDRV_VIDEO_UPDATE(pkunwar)
+ MCFG_PALETTE_INIT(nova2001)
+ MCFG_VIDEO_START(pkunwar)
+ MCFG_VIDEO_UPDATE(pkunwar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz (correct?)
- MDRV_SOUND_CONFIG(pkunwar_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz (correct?)
+ MCFG_SOUND_CONFIG(pkunwar_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/8)
- MDRV_SOUND_CONFIG(pkunwar_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/8)
+ MCFG_SOUND_CONFIG(pkunwar_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( raiders5, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(raiders5_cpu1_map)
- MDRV_CPU_IO_MAP(raiders5_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(raiders5_cpu1_map)
+ MCFG_CPU_IO_MAP(raiders5_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
- MDRV_CPU_PROGRAM_MAP(raiders5_cpu2_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */
+ MCFG_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_CPU_PROGRAM_MAP(raiders5_cpu2_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */
- MDRV_QUANTUM_TIME(HZ(24000))
+ MCFG_QUANTUM_TIME(HZ(24000))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(raiders5)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_GFXDECODE(raiders5)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_VIDEO_START(raiders5)
- MDRV_VIDEO_UPDATE(raiders5)
+ MCFG_VIDEO_START(raiders5)
+ MCFG_VIDEO_UPDATE(raiders5)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz
- MDRV_SOUND_CONFIG(pkunwar_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz
+ MCFG_SOUND_CONFIG(pkunwar_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/8)
- MDRV_SOUND_CONFIG(pkunwar_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/8)
+ MCFG_SOUND_CONFIG(pkunwar_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c
index e132f6203af..b52bf714c76 100644
--- a/src/mame/drivers/nsmpoker.c
+++ b/src/mame/drivers/nsmpoker.c
@@ -377,26 +377,26 @@ GFXDECODE_END
static MACHINE_CONFIG_START( nsmpoker, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS9995, MASTER_CLOCK/2) /* guess */
- MDRV_CPU_PROGRAM_MAP(nsmpoker_map)
- MDRV_CPU_IO_MAP(nsmpoker_portmap)
- MDRV_CPU_VBLANK_INT("screen", nsmpoker_interrupt)
+ MCFG_CPU_ADD("maincpu", TMS9995, MASTER_CLOCK/2) /* guess */
+ MCFG_CPU_PROGRAM_MAP(nsmpoker_map)
+ MCFG_CPU_IO_MAP(nsmpoker_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nsmpoker_interrupt)
/* 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, 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(nsmpoker)
+ MCFG_GFXDECODE(nsmpoker)
- MDRV_PALETTE_INIT(nsmpoker)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(nsmpoker)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_VIDEO_START(nsmpoker)
- MDRV_VIDEO_UPDATE(nsmpoker)
+ MCFG_VIDEO_START(nsmpoker)
+ MCFG_VIDEO_UPDATE(nsmpoker)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index ccab42aa05a..86eb78e6cc5 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -643,43 +643,43 @@ GFXDECODE_END
static MACHINE_CONFIG_START( snes, snes_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
- MDRV_CPU_PROGRAM_MAP(snes_map)
+ MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
+ MCFG_CPU_PROGRAM_MAP(snes_map)
- MDRV_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */
- MDRV_CPU_PROGRAM_MAP(spc_mem)
+ MCFG_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */
+ MCFG_CPU_PROGRAM_MAP(spc_mem)
- MDRV_QUANTUM_TIME(HZ(24000))
+ MCFG_QUANTUM_TIME(HZ(24000))
- MDRV_MACHINE_START( snes )
- MDRV_MACHINE_RESET( snes )
+ MCFG_MACHINE_START( snes )
+ MCFG_MACHINE_RESET( snes )
/* video hardware */
- MDRV_VIDEO_START( snes )
- MDRV_VIDEO_UPDATE( snes )
+ MCFG_VIDEO_START( snes )
+ MCFG_VIDEO_UPDATE( snes )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("spc700", SNES, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("spc700", SNES, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nss, snes )
- MDRV_CPU_ADD("bios", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(bios_map)
- MDRV_CPU_IO_MAP(bios_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
-// MDRV_CPU_FLAGS(CPU_DISABLE)
+ MCFG_CPU_ADD("bios", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(bios_map)
+ MCFG_CPU_IO_MAP(bios_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
+// MCFG_CPU_FLAGS(CPU_DISABLE)
- MDRV_GFXDECODE( nss )
- MDRV_PALETTE_LENGTH(2)
- MDRV_MACHINE_START( nss )
+ MCFG_GFXDECODE( nss )
+ MCFG_PALETTE_LENGTH(2)
+ MCFG_MACHINE_START( nss )
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 4a039b5af1e..478fb0e7453 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -655,59 +655,59 @@ static MACHINE_RESET( nwktr )
static MACHINE_CONFIG_START( nwktr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(nwktr_map)
+ MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_PROGRAM_MAP(nwktr_map)
- MDRV_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc_map)
+ MCFG_CPU_ADD("dsp", ADSP21062, 36000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(sharc_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(nwktr)
- MDRV_MACHINE_RESET(nwktr)
+ MCFG_MACHINE_START(nwktr)
+ MCFG_MACHINE_RESET(nwktr)
- MDRV_3DFX_VOODOO_1_ADD("voodoo", STD_VOODOO_1_CLOCK, 2, "screen")
- MDRV_3DFX_VOODOO_CPU("dsp")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 2)
- MDRV_3DFX_VOODOO_TMU_MEMORY(1, 2)
- MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
+ MCFG_3DFX_VOODOO_1_ADD("voodoo", STD_VOODOO_1_CLOCK, 2, "screen")
+ MCFG_3DFX_VOODOO_CPU("dsp")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 2)
+ MCFG_3DFX_VOODOO_TMU_MEMORY(1, 2)
+ MCFG_3DFX_VOODOO_VBLANK(voodoo_vblank_0)
- MDRV_K033906_ADD("k033906_1", nwktr_k033906_interface)
+ MCFG_K033906_ADD("k033906_1", nwktr_k033906_interface)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(512, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(512, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_VIDEO_UPDATE(nwktr)
+ MCFG_VIDEO_UPDATE(nwktr)
- MDRV_K001604_ADD("k001604", racingj_k001604_intf)
+ MCFG_K001604_ADD("k001604", racingj_k001604_intf)
- MDRV_K056800_ADD("k056800", nwktr_k056800_interface)
+ MCFG_K056800_ADD("k056800", nwktr_k056800_interface)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("rfsnd", RF5C400, 16934400) // as per Guru readme above
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("rfsnd", RF5C400, 16934400) // as per Guru readme above
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_M48T58_ADD( "m48t58" )
+ MCFG_M48T58_ADD( "m48t58" )
- MDRV_ADC12138_ADD( "adc12138", nwktr_adc_interface )
+ MCFG_ADC12138_ADD( "adc12138", nwktr_adc_interface )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( thrilld, nwktr )
- MDRV_DEVICE_REMOVE("k001604")
- MDRV_K001604_ADD("k001604", thrilld_k001604_intf)
+ MCFG_DEVICE_REMOVE("k001604")
+ MCFG_K001604_ADD("k001604", thrilld_k001604_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index a641ec6f77f..150fb65db19 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -844,61 +844,61 @@ static MACHINE_RESET( nycaptor )
static MACHINE_CONFIG_START( nycaptor, nycaptor_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* ??? */
- MDRV_CPU_PROGRAM_MAP(nycaptor_master_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(nycaptor_master_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(nycaptor_slave_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ generated by ??? */
+ MCFG_CPU_ADD("sub", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(nycaptor_slave_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ generated by ??? */
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* IRQ generated by ??? */
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(nycaptor_sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* IRQ generated by ??? */
- MDRV_CPU_ADD("mcu", M68705,2000000)
- MDRV_CPU_PROGRAM_MAP(nycaptor_m68705_map)
+ MCFG_CPU_ADD("mcu", M68705,2000000)
+ MCFG_CPU_PROGRAM_MAP(nycaptor_m68705_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs */
- MDRV_MACHINE_START(nycaptor)
- MDRV_MACHINE_RESET(nycaptor)
+ MCFG_MACHINE_START(nycaptor)
+ MCFG_MACHINE_RESET(nycaptor)
/* 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)
+ 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)
- MDRV_GFXDECODE(nycaptor)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(nycaptor)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(nycaptor)
- MDRV_VIDEO_UPDATE(nycaptor)
+ MCFG_VIDEO_START(nycaptor)
+ MCFG_VIDEO_UPDATE(nycaptor)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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("ay1", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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
@@ -906,60 +906,60 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cyclshtg, nycaptor_state )
- MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(cyclshtg_master_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(cyclshtg_master_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(cyclshtg_slave_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(cyclshtg_slave_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(nycaptor_sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60)
#ifdef USE_MCU
- MDRV_CPU_ADD("mcu", M68705,2000000)
- MDRV_CPU_PROGRAM_MAP(nycaptor_m68705_map)
+ MCFG_CPU_ADD("mcu", M68705,2000000)
+ MCFG_CPU_PROGRAM_MAP(nycaptor_m68705_map)
#endif
- MDRV_QUANTUM_TIME(HZ(60))
- MDRV_MACHINE_START(nycaptor)
- MDRV_MACHINE_RESET(nycaptor)
-
- 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(nycaptor)
- MDRV_PALETTE_LENGTH(512)
-
- MDRV_VIDEO_START(nycaptor)
- MDRV_VIDEO_UPDATE(nycaptor)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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_QUANTUM_TIME(HZ(60))
+ MCFG_MACHINE_START(nycaptor)
+ MCFG_MACHINE_RESET(nycaptor)
+
+ 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(nycaptor)
+ MCFG_PALETTE_LENGTH(512)
+
+ MCFG_VIDEO_START(nycaptor)
+ MCFG_VIDEO_UPDATE(nycaptor)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ay1", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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
@@ -968,56 +968,56 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bronx, nycaptor_state )
- MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(bronx_master_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- MDRV_CPU_ADD("sub", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(bronx_slave_map)
- MDRV_CPU_IO_MAP(bronx_slave_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(nycaptor_sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60)
-
- MDRV_QUANTUM_TIME(HZ(120))
- MDRV_MACHINE_START(nycaptor)
- MDRV_MACHINE_RESET(nycaptor)
-
- 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(nycaptor)
- MDRV_PALETTE_LENGTH(512)
-
- MDRV_VIDEO_START(nycaptor)
- MDRV_VIDEO_UPDATE(nycaptor)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
-
- MDRV_SOUND_ADD("msm", MSM5232, 2000000)
- 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_CPU_ADD("maincpu", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(bronx_master_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ MCFG_CPU_ADD("sub", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(bronx_slave_map)
+ MCFG_CPU_IO_MAP(bronx_slave_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(nycaptor_sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60)
+
+ MCFG_QUANTUM_TIME(HZ(120))
+ MCFG_MACHINE_START(nycaptor)
+ MCFG_MACHINE_RESET(nycaptor)
+
+ 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(nycaptor)
+ MCFG_PALETTE_LENGTH(512)
+
+ MCFG_VIDEO_START(nycaptor)
+ MCFG_VIDEO_UPDATE(nycaptor)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ay1", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ 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
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index a60e1f7402b..4b5a015b431 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -715,52 +715,52 @@ static MACHINE_RESET( nyny )
static MACHINE_CONFIG_START( nyny, nyny_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 1400000) /* 1.40 MHz? The clock signal is generated by analog chips */
- MDRV_CPU_PROGRAM_MAP(nyny_main_map)
- MDRV_CPU_PERIODIC_INT(update_pia_1, 25)
+ MCFG_CPU_ADD("maincpu", M6809, 1400000) /* 1.40 MHz? The clock signal is generated by analog chips */
+ MCFG_CPU_PROGRAM_MAP(nyny_main_map)
+ MCFG_CPU_PERIODIC_INT(update_pia_1, 25)
- MDRV_CPU_ADD("audiocpu", M6802, AUDIO_CPU_1_CLOCK)
- MDRV_CPU_PROGRAM_MAP(nyny_audio_1_map)
+ MCFG_CPU_ADD("audiocpu", M6802, AUDIO_CPU_1_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(nyny_audio_1_map)
- MDRV_CPU_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK)
- MDRV_CPU_PROGRAM_MAP(nyny_audio_2_map)
+ MCFG_CPU_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(nyny_audio_2_map)
- MDRV_MACHINE_START(nyny)
- MDRV_MACHINE_RESET(nyny)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(nyny)
+ MCFG_MACHINE_RESET(nyny)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_UPDATE(nyny)
+ MCFG_VIDEO_UPDATE(nyny)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
- MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
/* 74LS123 */
- MDRV_TTL74123_ADD("ic48_1", ic48_1_config)
+ MCFG_TTL74123_ADD("ic48_1", ic48_1_config)
- MDRV_PIA6821_ADD("pia1", pia_1_intf)
- MDRV_PIA6821_ADD("pia2", pia_2_intf)
+ MCFG_PIA6821_ADD("pia1", pia_1_intf)
+ MCFG_PIA6821_ADD("pia2", pia_2_intf)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, AUDIO_CPU_1_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_37_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CPU_1_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_37_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, AUDIO_CPU_1_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_64_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CPU_1_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_64_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay3", AY8910, AUDIO_CPU_2_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.03)
+ MCFG_SOUND_ADD("ay3", AY8910, AUDIO_CPU_2_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.03)
- 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
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index 95d0cec5f2f..c144d7404b2 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -406,29 +406,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( offtwall, offtwall_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(offtwall)
- MDRV_MACHINE_RESET(offtwall)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(offtwall)
+ MCFG_MACHINE_RESET(offtwall)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(offtwall)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(offtwall)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a VAD chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(offtwall)
- MDRV_VIDEO_UPDATE(offtwall)
+ MCFG_VIDEO_START(offtwall)
+ MCFG_VIDEO_UPDATE(offtwall)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_iii_mono_noadpcm)
+ MCFG_FRAGMENT_ADD(jsa_iii_mono_noadpcm)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 3fc5ef5256c..f42b74d7245 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -320,34 +320,34 @@ static MACHINE_RESET( ohmygod )
static MACHINE_CONFIG_START( ohmygod, ohmygod_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(ohmygod_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(ohmygod_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
- MDRV_MACHINE_START(ohmygod)
- MDRV_MACHINE_RESET(ohmygod)
+ MCFG_MACHINE_START(ohmygod)
+ MCFG_MACHINE_RESET(ohmygod)
/* 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(12*8, (64-12)*8-1, 0*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 0*8, 30*8-1 )
- MDRV_GFXDECODE(ohmygod)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ohmygod)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(ohmygod)
- MDRV_VIDEO_UPDATE(ohmygod)
+ MCFG_VIDEO_START(ohmygod)
+ MCFG_VIDEO_UPDATE(ohmygod)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 14000000/8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 14000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index 76f10ac5720..3be5c99224c 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -860,153 +860,153 @@ static MACHINE_RESET( ojankohs )
static MACHINE_CONFIG_START( ojankohs, ojankohs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ojankohs_map)
- MDRV_CPU_IO_MAP(ojankohs_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(ojankohs_map)
+ MCFG_CPU_IO_MAP(ojankohs_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(ojankohs)
- MDRV_MACHINE_RESET(ojankohs)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(ojankohs)
+ MCFG_MACHINE_RESET(ojankohs)
+ 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(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1)
- MDRV_GFXDECODE(ojankohs)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ojankohs)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(ojankohs)
- MDRV_VIDEO_UPDATE(ojankohs)
+ MCFG_VIDEO_START(ojankohs)
+ MCFG_VIDEO_UPDATE(ojankohs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12000000/6)
- MDRV_SOUND_CONFIG(ojankohs_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("aysnd", AY8910, 12000000/6)
+ MCFG_SOUND_CONFIG(ojankohs_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ojankoy, ojankohs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ojankoy_map)
- MDRV_CPU_IO_MAP(ojankoy_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(ojankoy_map)
+ MCFG_CPU_IO_MAP(ojankoy_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(ojankoy)
- MDRV_MACHINE_RESET(ojankohs)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(ojankoy)
+ MCFG_MACHINE_RESET(ojankohs)
+ 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(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1)
- MDRV_GFXDECODE(ojankohs)
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(ojankoy)
+ MCFG_GFXDECODE(ojankohs)
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT(ojankoy)
- MDRV_VIDEO_START(ojankoy)
- MDRV_VIDEO_UPDATE(ojankohs)
+ MCFG_VIDEO_START(ojankoy)
+ MCFG_VIDEO_UPDATE(ojankohs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(ojankoy_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("aysnd", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(ojankoy_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ccasino, ojankohs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(ojankoy_map)
- MDRV_CPU_IO_MAP(ccasino_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(ojankoy_map)
+ MCFG_CPU_IO_MAP(ccasino_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(ojankohs)
- MDRV_MACHINE_RESET(ojankohs)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(ojankohs)
+ MCFG_MACHINE_RESET(ojankohs)
+ 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(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1)
- MDRV_GFXDECODE(ojankohs)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(ojankohs)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(ojankoy)
- MDRV_VIDEO_UPDATE(ojankohs)
+ MCFG_VIDEO_START(ojankoy)
+ MCFG_VIDEO_UPDATE(ojankohs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(ojankoy_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("aysnd", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(ojankoy_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ojankoc, ojankohs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4.00 MHz */
- MDRV_CPU_PROGRAM_MAP(ojankoc_map)
- MDRV_CPU_IO_MAP(ojankoc_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(ojankoc_map)
+ MCFG_CPU_IO_MAP(ojankoc_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(ojankoc)
- MDRV_MACHINE_RESET(ojankohs)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(ojankoc)
+ MCFG_MACHINE_RESET(ojankohs)
+ 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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 8, 248-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, 256-1, 8, 248-1)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(ojankoc)
- MDRV_VIDEO_UPDATE(ojankoc)
+ MCFG_VIDEO_START(ojankoc)
+ MCFG_VIDEO_UPDATE(ojankoc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4)
- MDRV_SOUND_CONFIG(ojankoc_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("aysnd", AY8910, 8000000/4)
+ MCFG_SOUND_CONFIG(ojankoc_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("msm", MSM5205, 8000000/22)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 8000000/22)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 417d087c7df..084380ae5a4 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -439,39 +439,39 @@ static MACHINE_RESET( olibochu )
static MACHINE_CONFIG_START( olibochu, olibochu_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ?? */
- MDRV_CPU_PROGRAM_MAP(olibochu_map)
- MDRV_CPU_VBLANK_INT_HACK(olibochu_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ?? */
+ MCFG_CPU_PROGRAM_MAP(olibochu_map)
+ MCFG_CPU_VBLANK_INT_HACK(olibochu_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ?? */
- MDRV_CPU_PROGRAM_MAP(olibochu_sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,60) //???
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ?? */
+ MCFG_CPU_PROGRAM_MAP(olibochu_sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,60) //???
-// MDRV_QUANTUM_PERFECT_CPU("maincpu")
+// MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(olibochu)
- MDRV_MACHINE_RESET(olibochu)
+ MCFG_MACHINE_START(olibochu)
+ MCFG_MACHINE_RESET(olibochu)
/* 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, 1*8, 31*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, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(olibochu)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(olibochu)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(olibochu)
- MDRV_VIDEO_START(olibochu)
- MDRV_VIDEO_UPDATE(olibochu)
+ MCFG_PALETTE_INIT(olibochu)
+ MCFG_VIDEO_START(olibochu)
+ MCFG_VIDEO_UPDATE(olibochu)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 9944024ede3..2a149f02e4c 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -474,42 +474,42 @@ static MACHINE_CONFIG_START( omegrace, driver_device )
/* main CPU */
/* XTAL101 Crystal @ 12mhz */
/* through 74LS161, Pin 13 = divide by 4 */
- MDRV_CPU_ADD("maincpu", Z80,12000000/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(port_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,250)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(port_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,250)
/* audio CPU */
/* XTAL101 Crystal @ 12mhz */
/* through 74LS161, Pin 12 = divide by 8 */
/* Fed to CPU as 1.5mhz though line J4-D */
- MDRV_CPU_ADD("audiocpu", Z80,12000000/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_port)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,250)
+ MCFG_CPU_ADD("audiocpu", Z80,12000000/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_port)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,250)
- MDRV_MACHINE_RESET(omegrace)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(omegrace)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(40)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(522, 1566, 522, 1566)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(40)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(522, 1566, 522, 1566)
- MDRV_VIDEO_START(dvg)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(dvg)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* XTAL101 Crystal @ 12mhz */
/* through 74LS92, Pin 8 = divide by 12 */
- MDRV_SOUND_ADD("ay1", AY8912, 12000000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8912, 12000000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8912, 12000000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8912, 12000000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index cc01ed3509f..28aeaf3fd66 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -373,38 +373,38 @@ static MACHINE_RESET( oneshot )
static MACHINE_CONFIG_START( oneshot, oneshot_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(oneshot_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(oneshot_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(oneshot_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(oneshot_sound_map)
- MDRV_MACHINE_START(oneshot)
- MDRV_MACHINE_RESET(oneshot)
+ MCFG_MACHINE_START(oneshot)
+ MCFG_MACHINE_RESET(oneshot)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 20*16-1, 0*16, 15*16-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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 20*16-1, 0*16, 15*16-1)
- MDRV_GFXDECODE(oneshot)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(oneshot)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(oneshot)
- MDRV_VIDEO_UPDATE(oneshot)
+ MCFG_VIDEO_START(oneshot)
+ MCFG_VIDEO_UPDATE(oneshot)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3500000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3500000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- 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_DERIVED( maddonna, oneshot )
@@ -412,7 +412,7 @@ static MACHINE_CONFIG_DERIVED( maddonna, oneshot )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_UPDATE(maddonna) // no crosshair
+ MCFG_VIDEO_UPDATE(maddonna) // no crosshair
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index 67c2d4075f0..3bdfab6d073 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -354,40 +354,40 @@ static MACHINE_START( onetwo )
static MACHINE_CONFIG_START( onetwo, onetwo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(main_cpu)
- MDRV_CPU_IO_MAP(main_cpu_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_cpu)
+ MCFG_CPU_IO_MAP(main_cpu_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,MASTER_CLOCK) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_cpu)
- MDRV_CPU_IO_MAP(sound_cpu_io)
+ MCFG_CPU_ADD("audiocpu", Z80,MASTER_CLOCK) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_CPU_IO_MAP(sound_cpu_io)
- MDRV_MACHINE_START(onetwo)
+ MCFG_MACHINE_START(onetwo)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(16))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(16))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
- MDRV_GFXDECODE(onetwo)
- MDRV_PALETTE_LENGTH(0x80)
+ MCFG_GFXDECODE(onetwo)
+ MCFG_PALETTE_LENGTH(0x80)
- MDRV_VIDEO_START(onetwo)
- MDRV_VIDEO_UPDATE(onetwo)
+ MCFG_VIDEO_START(onetwo)
+ MCFG_VIDEO_UPDATE(onetwo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 1056000*2, OKIM6295_PIN7_LOW) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000*2, OKIM6295_PIN7_LOW) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 4fa1d2fe48d..9ce6578b3e4 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -739,109 +739,109 @@ static const tc0140syt_interface opwolf_tc0140syt_intf =
static MACHINE_CONFIG_START( opwolf, opwolf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(opwolf_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(opwolf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(opwolf)
- MDRV_MACHINE_RESET(opwolf)
+ MCFG_MACHINE_START(opwolf)
+ MCFG_MACHINE_RESET(opwolf)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(opwolf)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(opwolf)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_UPDATE(opwolf)
+ MCFG_VIDEO_UPDATE(opwolf)
- MDRV_PC080SN_ADD("pc080sn", opwolf_pc080sn_intf)
- MDRV_PC090OJ_ADD("pc090oj", opwolf_pc090oj_intf)
+ MCFG_PC080SN_ADD("pc080sn", opwolf_pc080sn_intf)
+ MCFG_PC090OJ_ADD("pc090oj", opwolf_pc090oj_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK ) /* 4 MHz */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK ) /* 4 MHz */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("msm1", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("msm1", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
- MDRV_SOUND_ADD("msm2", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
- MDRV_TC0140SYT_ADD("tc0140syt", opwolf_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", opwolf_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( opwolfb, opwolf_state ) /* OSC clocks unknown for the bootleg, but changed to match original sets */
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(opwolfb_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(opwolfb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
- MDRV_CPU_ADD("sub", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(opwolfb_sub_z80_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(opwolfb_sub_z80_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(opwolf)
+ MCFG_MACHINE_START(opwolf)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(opwolfb)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(opwolfb)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_UPDATE(opwolf)
+ MCFG_VIDEO_UPDATE(opwolf)
- MDRV_PC080SN_ADD("pc080sn", opwolf_pc080sn_intf)
- MDRV_PC090OJ_ADD("pc090oj", opwolf_pc090oj_intf)
+ MCFG_PC080SN_ADD("pc080sn", opwolf_pc080sn_intf)
+ MCFG_PC090OJ_ADD("pc090oj", opwolf_pc090oj_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK )
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CPU_CLOCK )
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("msm1", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("msm1", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
- MDRV_SOUND_ADD("msm2", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
- MDRV_TC0140SYT_ADD("tc0140syt", opwolf_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", opwolf_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index da62dc509a2..94e21222137 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -301,33 +301,33 @@ static MACHINE_RESET( orbit )
static MACHINE_CONFIG_START( orbit, orbit_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, MASTER_CLOCK / 16)
- MDRV_CPU_PROGRAM_MAP(orbit_map)
- MDRV_CPU_VBLANK_INT("screen", orbit_interrupt)
+ MCFG_CPU_ADD("maincpu", M6800, MASTER_CLOCK / 16)
+ MCFG_CPU_PROGRAM_MAP(orbit_map)
+ MCFG_CPU_VBLANK_INT("screen", orbit_interrupt)
- MDRV_TIMER_ADD_SCANLINE("32v", nmi_32v, "screen", 0, 32)
+ MCFG_TIMER_ADD_SCANLINE("32v", nmi_32v, "screen", 0, 32)
- MDRV_MACHINE_START(orbit)
- MDRV_MACHINE_RESET(orbit)
+ MCFG_MACHINE_START(orbit)
+ MCFG_MACHINE_RESET(orbit)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK*2, 384*2, 0, 256*2, 261*2, 0, 240*2)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2, 384*2, 0, 256*2, 261*2, 0, 240*2)
- MDRV_GFXDECODE(orbit)
- MDRV_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(orbit)
- MDRV_VIDEO_UPDATE(orbit)
+ MCFG_GFXDECODE(orbit)
+ MCFG_PALETTE_LENGTH(2)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(orbit)
+ MCFG_VIDEO_UPDATE(orbit)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(orbit)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(orbit)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c
index f2691b777dc..e24b3e5e9dc 100644
--- a/src/mame/drivers/othello.c
+++ b/src/mame/drivers/othello.c
@@ -411,49 +411,49 @@ static MACHINE_RESET( othello )
static MACHINE_CONFIG_START( othello, othello_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,XTAL_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_IO_MAP(audio_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_IO_MAP(audio_portmap)
- MDRV_CPU_ADD("n7751", N7751, XTAL_6MHz)
- MDRV_CPU_IO_MAP(n7751_portmap)
+ MCFG_CPU_ADD("n7751", N7751, XTAL_6MHz)
+ MCFG_CPU_IO_MAP(n7751_portmap)
- MDRV_I8243_ADD("n7751_8243", NULL, n7751_rom_control_w)
+ MCFG_I8243_ADD("n7751_8243", NULL, n7751_rom_control_w)
- MDRV_MACHINE_START(othello)
- MDRV_MACHINE_RESET(othello)
+ MCFG_MACHINE_START(othello)
+ MCFG_MACHINE_RESET(othello)
/* 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*6, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*6-1, 0*8, 64*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(64*6, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*6-1, 0*8, 64*8-1)
- MDRV_PALETTE_LENGTH(0x10)
- MDRV_PALETTE_INIT(othello)
+ MCFG_PALETTE_LENGTH(0x10)
+ MCFG_PALETTE_INIT(othello)
- MDRV_VIDEO_UPDATE(othello)
+ MCFG_VIDEO_UPDATE(othello)
- MDRV_MC6845_ADD("crtc", H46505, 1000000 /* ? MHz */, h46505_intf) /* H46505 @ CPU clock */
+ MCFG_MC6845_ADD("crtc", H46505, 1000000 /* ? MHz */, h46505_intf) /* H46505 @ CPU clock */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
ROM_START( othello )
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index 42dffc435f9..06e9448c4ef 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -240,33 +240,33 @@ static MACHINE_RESET( othldrby )
static MACHINE_CONFIG_START( othldrby, othldrby_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(othldrby_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(othldrby_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(othldrby)
- MDRV_MACHINE_RESET(othldrby)
+ MCFG_MACHINE_START(othldrby)
+ MCFG_MACHINE_RESET(othldrby)
/* 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(12*8, (64-12)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(othldrby)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(othldrby)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(othldrby)
- MDRV_VIDEO_EOF(othldrby)
- MDRV_VIDEO_UPDATE(othldrby)
+ MCFG_VIDEO_START(othldrby)
+ MCFG_VIDEO_EOF(othldrby)
+ MCFG_VIDEO_UPDATE(othldrby)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1584000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1584000, 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/othunder.c b/src/mame/drivers/othunder.c
index 6b309b788f9..57873fdab72 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -721,64 +721,64 @@ static MACHINE_RESET( othunder )
static MACHINE_CONFIG_START( othunder, othunder_state )
/* basic machine hardware */
-// MDRV_CPU_ADD("maincpu", M68000, 24000000/2 ) /* 12 MHz */
- MDRV_CPU_ADD("maincpu", M68000, 13000000 ) /* fixes garbage graphics on startup */
- MDRV_CPU_PROGRAM_MAP(othunder_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_interrupt)
+// MCFG_CPU_ADD("maincpu", M68000, 24000000/2 ) /* 12 MHz */
+ MCFG_CPU_ADD("maincpu", M68000, 13000000 ) /* fixes garbage graphics on startup */
+ MCFG_CPU_PROGRAM_MAP(othunder_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4 ) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4 ) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_MACHINE_START(othunder)
- MDRV_MACHINE_RESET(othunder)
+ MCFG_MACHINE_START(othunder)
+ MCFG_MACHINE_RESET(othunder)
- MDRV_TC0220IOC_ADD("tc0220ioc", othunder_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", othunder_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(othunder)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(othunder)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(othunder)
- MDRV_VIDEO_UPDATE(othunder)
+ MCFG_VIDEO_START(othunder)
+ MCFG_VIDEO_UPDATE(othunder)
- MDRV_TC0100SCN_ADD("tc0100scn", othunder_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", othunder_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", othunder_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", othunder_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "2610.0l", 0.25)
- MDRV_SOUND_ROUTE(0, "2610.0r", 0.25)
- MDRV_SOUND_ROUTE(1, "2610.1l", 1.0)
- MDRV_SOUND_ROUTE(1, "2610.1r", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2l", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2r", 1.0)
-
- MDRV_SOUND_ADD("2610.0l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.0r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", othunder_tc0140syt_intf)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "2610.0l", 0.25)
+ MCFG_SOUND_ROUTE(0, "2610.0r", 0.25)
+ MCFG_SOUND_ROUTE(1, "2610.1l", 1.0)
+ MCFG_SOUND_ROUTE(1, "2610.1r", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2l", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2r", 1.0)
+
+ MCFG_SOUND_ADD("2610.0l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.0r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", othunder_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 7461a83e4b1..179a7001a6e 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -332,64 +332,64 @@ static MACHINE_RESET( overdriv )
static MACHINE_CONFIG_START( overdriv, overdriv_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(overdriv_master_map)
- MDRV_CPU_VBLANK_INT_HACK(cpuA_interrupt,4) /* ??? IRQ 4 is vblank, IRQ 5 of unknown origin */
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(overdriv_master_map)
+ MCFG_CPU_VBLANK_INT_HACK(cpuA_interrupt,4) /* ??? IRQ 4 is vblank, IRQ 5 of unknown origin */
- MDRV_CPU_ADD("sub", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(overdriv_slave_map)
- MDRV_CPU_VBLANK_INT("screen", cpuB_interrupt) /* IRQ 5 and 6 are generated by the main CPU. */
+ MCFG_CPU_ADD("sub", M68000,24000000/2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(overdriv_slave_map)
+ MCFG_CPU_VBLANK_INT("screen", cpuB_interrupt) /* IRQ 5 and 6 are generated by the main CPU. */
/* IRQ 5 is used only in test mode, to request the checksums of the gfx ROMs. */
- MDRV_CPU_ADD("audiocpu", M6809,3579545/2) /* 1.789 MHz?? This might be the right speed, but ROM testing */
+ MCFG_CPU_ADD("audiocpu", M6809,3579545/2) /* 1.789 MHz?? This might be the right speed, but ROM testing */
/* takes a little too much (the counter wraps from 0000 to 9999). */
/* This might just mean that the video refresh rate is less than */
/* 60 fps, that's how I fixed it for now. */
- MDRV_CPU_PROGRAM_MAP(overdriv_sound_map)
+ MCFG_CPU_PROGRAM_MAP(overdriv_sound_map)
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_START(overdriv)
- MDRV_MACHINE_RESET(overdriv)
+ MCFG_MACHINE_START(overdriv)
+ MCFG_MACHINE_RESET(overdriv)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_EEPROM_DATA(overdriv_default_eeprom, 128)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_DATA(overdriv_default_eeprom, 128)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59)
- 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, 0*8, 32*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59)
+ 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, 0*8, 32*8-1 )
-// MDRV_GFXDECODE(overdriv)
- MDRV_PALETTE_LENGTH(2048)
+// MCFG_GFXDECODE(overdriv)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(overdriv)
+ MCFG_VIDEO_UPDATE(overdriv)
- MDRV_K053246_ADD("k053246", overdriv_k053246_intf)
- MDRV_K051316_ADD("k051316_1", overdriv_k051316_intf_1)
- MDRV_K051316_ADD("k051316_2", overdriv_k051316_intf_2)
- MDRV_K053251_ADD("k053251")
+ MCFG_K053246_ADD("k053246", overdriv_k053246_intf)
+ MCFG_K051316_ADD("k051316_1", overdriv_k051316_intf_1)
+ MCFG_K051316_ADD("k051316_2", overdriv_k051316_intf_2)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.5)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.5)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MDRV_SOUND_ADD("k053260_1", K053260, 3579545)
- MDRV_SOUND_CONFIG(k053260_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.35)
+ MCFG_SOUND_ADD("k053260_1", K053260, 3579545)
+ MCFG_SOUND_CONFIG(k053260_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
- MDRV_SOUND_ADD("k053260_2", K053260, 3579545)
- MDRV_SOUND_CONFIG(k053260_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.35)
+ MCFG_SOUND_ADD("k053260_2", K053260, 3579545)
+ MCFG_SOUND_CONFIG(k053260_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c
index 3cbf587ecac..f4174968b73 100644
--- a/src/mame/drivers/pachifev.c
+++ b/src/mame/drivers/pachifev.c
@@ -362,33 +362,33 @@ static const struct tms9995reset_param pachifev_processor_config =
static MACHINE_CONFIG_START( pachifev, pachifev_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS9995, XTAL_12MHz)
- MDRV_CPU_CONFIG(pachifev_processor_config)
- MDRV_CPU_PROGRAM_MAP(pachifev_map)
- MDRV_CPU_IO_MAP(pachifev_cru)
- MDRV_CPU_VBLANK_INT("screen",pachifev_vblank_irq)
+ MCFG_CPU_ADD("maincpu", TMS9995, XTAL_12MHz)
+ MCFG_CPU_CONFIG(pachifev_processor_config)
+ MCFG_CPU_PROGRAM_MAP(pachifev_map)
+ MCFG_CPU_IO_MAP(pachifev_cru)
+ MCFG_CPU_VBLANK_INT("screen",pachifev_vblank_irq)
- MDRV_MACHINE_START(pachifev)
- MDRV_MACHINE_RESET(pachifev)
+ MCFG_MACHINE_START(pachifev)
+ MCFG_MACHINE_RESET(pachifev)
/* video hardware */
- MDRV_FRAGMENT_ADD(tms9928a)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE((float)XTAL_10_738635MHz/2/342/262)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(4395)) /* 69 lines */
+ MCFG_FRAGMENT_ADD(tms9928a)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE((float)XTAL_10_738635MHz/2/342/262)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(4395)) /* 69 lines */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
#if USE_MSM
- MDRV_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz) /* guess */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz) /* guess */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
#endif
- MDRV_SOUND_ADD("sn76_1", SN76489A, XTAL_10_738635MHz/3) /* guess */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("sn76_2", SN76489A, XTAL_10_738635MHz/3) /* guess */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn76_1", SN76489A, XTAL_10_738635MHz/3) /* guess */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn76_2", SN76489A, XTAL_10_738635MHz/3) /* guess */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
ROM_START( pachifev )
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 416aea9a45f..4a385c3f96c 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -401,38 +401,38 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( pacland, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 49152000/32) /* 1.536 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", M6809, 49152000/32) /* 1.536 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* 1.536 MHz? */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
- MDRV_CPU_IO_MAP(mcu_port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("mcu", HD63701, 49152000/8) /* 1.536 MHz? */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_IO_MAP(mcu_port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synching between the MCU and the CPU */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* we need heavy synching between the MCU and the CPU */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- 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(3*8, 39*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ 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(3*8, 39*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pacland)
- MDRV_PALETTE_LENGTH(256*4+256*4+64*16)
+ MCFG_GFXDECODE(pacland)
+ MCFG_PALETTE_LENGTH(256*4+256*4+64*16)
- MDRV_PALETTE_INIT(pacland)
- MDRV_VIDEO_START(pacland)
- MDRV_VIDEO_UPDATE(pacland)
+ MCFG_PALETTE_INIT(pacland)
+ MCFG_VIDEO_START(pacland)
+ MCFG_VIDEO_UPDATE(pacland)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2/1024)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2/1024)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index d5fb761be12..792b483d5dd 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -3165,30 +3165,30 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( pacman, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(pacman_map)
- MDRV_CPU_IO_MAP(writeport)
- MDRV_CPU_VBLANK_INT_HACK(pacman_interrupt,2)
- MDRV_WATCHDOG_VBLANK_INIT(16)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
+ MCFG_CPU_PROGRAM_MAP(pacman_map)
+ MCFG_CPU_IO_MAP(writeport)
+ MCFG_CPU_VBLANK_INT_HACK(pacman_interrupt,2)
+ MCFG_WATCHDOG_VBLANK_INIT(16)
/* video hardware */
- MDRV_GFXDECODE(pacman)
- MDRV_PALETTE_LENGTH(128*4)
+ MCFG_GFXDECODE(pacman)
+ MCFG_PALETTE_LENGTH(128*4)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(pacman)
- MDRV_VIDEO_START(pacman)
- MDRV_VIDEO_UPDATE(pacman)
+ MCFG_PALETTE_INIT(pacman)
+ MCFG_VIDEO_START(pacman)
+ MCFG_VIDEO_UPDATE(pacman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3196,8 +3196,8 @@ static MACHINE_CONFIG_DERIVED( piranha, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(piranha_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(piranha_portmap)
MACHINE_CONFIG_END
@@ -3205,8 +3205,8 @@ static MACHINE_CONFIG_DERIVED( nmouse, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(nmouse_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(nmouse_portmap)
MACHINE_CONFIG_END
@@ -3214,8 +3214,8 @@ static MACHINE_CONFIG_DERIVED( mspacman, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mspacman_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mspacman_map)
MACHINE_CONFIG_END
@@ -3223,8 +3223,8 @@ static MACHINE_CONFIG_DERIVED( woodpek, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(woodpek_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(woodpek_map)
MACHINE_CONFIG_END
@@ -3233,9 +3233,9 @@ static MACHINE_CONFIG_DERIVED( alibaba, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(alibaba_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(alibaba_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
@@ -3243,14 +3243,14 @@ static MACHINE_CONFIG_DERIVED( dremshpr, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dremshpr_map)
- MDRV_CPU_IO_MAP(dremshpr_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dremshpr_map)
+ MCFG_CPU_IO_MAP(dremshpr_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* sound hardware */
- MDRV_SOUND_REPLACE("namco", AY8910, 14318000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_REPLACE("namco", AY8910, 14318000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -3258,12 +3258,12 @@ static MACHINE_CONFIG_DERIVED( theglobp, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(epos_map)
- MDRV_CPU_IO_MAP(theglobp_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(epos_map)
+ MCFG_CPU_IO_MAP(theglobp_portmap)
- MDRV_MACHINE_START(theglobp)
- MDRV_MACHINE_RESET(theglobp)
+ MCFG_MACHINE_START(theglobp)
+ MCFG_MACHINE_RESET(theglobp)
MACHINE_CONFIG_END
@@ -3271,12 +3271,12 @@ static MACHINE_CONFIG_DERIVED( acitya, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(epos_map)
- MDRV_CPU_IO_MAP(acitya_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(epos_map)
+ MCFG_CPU_IO_MAP(acitya_portmap)
- MDRV_MACHINE_START(acitya)
- MDRV_MACHINE_RESET(acitya)
+ MCFG_MACHINE_START(acitya)
+ MCFG_MACHINE_RESET(acitya)
MACHINE_CONFIG_END
@@ -3284,20 +3284,20 @@ static MACHINE_CONFIG_DERIVED( vanvan, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vanvan_map)
- MDRV_CPU_IO_MAP(vanvan_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(vanvan_map)
+ MCFG_CPU_IO_MAP(vanvan_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(2*8, 34*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1, 0*8, 28*8-1)
/* sound hardware */
- MDRV_SOUND_REPLACE("namco", SN76496, 1789750)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD("sn2", SN76496, 1789750)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_REPLACE("namco", SN76496, 1789750)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("sn2", SN76496, 1789750)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -3305,13 +3305,13 @@ static MACHINE_CONFIG_DERIVED( bigbucks, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bigbucks_map)
- MDRV_CPU_IO_MAP(bigbucks_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,20)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bigbucks_map)
+ MCFG_CPU_IO_MAP(bigbucks_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,20)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
MACHINE_CONFIG_END
@@ -3319,24 +3319,24 @@ static MACHINE_CONFIG_DERIVED( s2650games, pacman )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("maincpu")
- MDRV_CPU_ADD("maincpu", S2650, MASTER_CLOCK/6/2) /* 2H */
- MDRV_CPU_PROGRAM_MAP(s2650games_map)
- MDRV_CPU_VBLANK_INT("screen", s2650_interrupt)
+ MCFG_DEVICE_REMOVE("maincpu")
+ MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/6/2) /* 2H */
+ MCFG_CPU_PROGRAM_MAP(s2650games_map)
+ MCFG_CPU_VBLANK_INT("screen", s2650_interrupt)
- MDRV_GFXDECODE(s2650games)
+ MCFG_GFXDECODE(s2650games)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_VIDEO_START(s2650games)
- MDRV_VIDEO_UPDATE(s2650games)
+ MCFG_VIDEO_START(s2650games)
+ MCFG_VIDEO_UPDATE(s2650games)
/* sound hardware */
- MDRV_SOUND_REPLACE("namco", SN76496, MASTER_CLOCK/6) /* 1H */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_REPLACE("namco", SN76496, MASTER_CLOCK/6) /* 1H */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -3344,8 +3344,8 @@ static MACHINE_CONFIG_DERIVED( drivfrcp, s2650games )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(drivfrcp_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(drivfrcp_portmap)
MACHINE_CONFIG_END
@@ -3353,8 +3353,8 @@ static MACHINE_CONFIG_DERIVED( 8bpm, s2650games )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(_8bpm_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(_8bpm_portmap)
MACHINE_CONFIG_END
@@ -3362,8 +3362,8 @@ static MACHINE_CONFIG_DERIVED( porky, s2650games )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(porky_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(porky_portmap)
MACHINE_CONFIG_END
@@ -3371,12 +3371,12 @@ static MACHINE_CONFIG_DERIVED( rocktrv2, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rocktrv2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rocktrv2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
MACHINE_CONFIG_END
@@ -3384,12 +3384,12 @@ static MACHINE_CONFIG_DERIVED( mschamp, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mschamp_map)
- MDRV_CPU_IO_MAP(mschamp_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mschamp_map)
+ MCFG_CPU_IO_MAP(mschamp_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(mschamp)
+ MCFG_MACHINE_RESET(mschamp)
MACHINE_CONFIG_END
@@ -3397,7 +3397,7 @@ static MACHINE_CONFIG_DERIVED( crush4, mschamp )
/* basic machine hardware */
- MDRV_GFXDECODE(crush4)
+ MCFG_GFXDECODE(crush4)
MACHINE_CONFIG_END
static const ay8910_interface crushs_ay8910_interface =
@@ -3414,14 +3414,14 @@ static MACHINE_CONFIG_DERIVED( crushs, pacman )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(crushs_map)
- MDRV_CPU_IO_MAP(crushs_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(crushs_map)
+ MCFG_CPU_IO_MAP(crushs_portmap)
/* sound hardware */
- MDRV_SOUND_REPLACE("namco", AY8912, 1789750)
- MDRV_SOUND_CONFIG(crushs_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_REPLACE("namco", AY8912, 1789750)
+ MCFG_SOUND_CONFIG(crushs_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 80dc594340d..cbb8075ce28 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -352,50 +352,50 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( pandoras, pandoras_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6) /* CPU A */
- MDRV_CPU_PROGRAM_MAP(pandoras_master_map)
- MDRV_CPU_VBLANK_INT("screen", pandoras_master_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6) /* CPU A */
+ MCFG_CPU_PROGRAM_MAP(pandoras_master_map)
+ MCFG_CPU_VBLANK_INT("screen", pandoras_master_interrupt)
- MDRV_CPU_ADD("sub", M6809, MASTER_CLOCK/6) /* CPU B */
- MDRV_CPU_PROGRAM_MAP(pandoras_slave_map)
- MDRV_CPU_VBLANK_INT("screen", pandoras_slave_interrupt)
+ MCFG_CPU_ADD("sub", M6809, MASTER_CLOCK/6) /* CPU B */
+ MCFG_CPU_PROGRAM_MAP(pandoras_slave_map)
+ MCFG_CPU_VBLANK_INT("screen", pandoras_slave_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(pandoras_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(pandoras_sound_map)
- MDRV_CPU_ADD("mcu", I8039, SOUND_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(pandoras_i8039_map)
- MDRV_CPU_IO_MAP(pandoras_i8039_io_map)
+ MCFG_CPU_ADD("mcu", I8039, SOUND_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(pandoras_i8039_map)
+ MCFG_CPU_IO_MAP(pandoras_i8039_io_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - needed for correct synchronization of the sound CPUs */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - needed for correct synchronization of the sound CPUs */
- MDRV_MACHINE_START(pandoras)
- MDRV_MACHINE_RESET(pandoras)
+ MCFG_MACHINE_START(pandoras)
+ MCFG_MACHINE_RESET(pandoras)
/* 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)
+ 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)
- MDRV_GFXDECODE(pandoras)
- MDRV_PALETTE_LENGTH(16*16+16*16)
+ MCFG_GFXDECODE(pandoras)
+ MCFG_PALETTE_LENGTH(16*16+16*16)
- MDRV_PALETTE_INIT(pandoras)
- MDRV_VIDEO_START(pandoras)
- MDRV_VIDEO_UPDATE(pandoras)
+ MCFG_PALETTE_INIT(pandoras)
+ MCFG_VIDEO_START(pandoras)
+ MCFG_VIDEO_UPDATE(pandoras)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c
index 524ea9ebcca..d5e57e2d9a3 100644
--- a/src/mame/drivers/pangofun.c
+++ b/src/mame/drivers/pangofun.c
@@ -112,21 +112,21 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( pangofun, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I486, 14318180*2) /* I486 ?? Mhz */
- MDRV_CPU_PROGRAM_MAP(pangofun_map)
+ MCFG_CPU_ADD("maincpu", I486, 14318180*2) /* I486 ?? Mhz */
+ MCFG_CPU_PROGRAM_MAP(pangofun_map)
/* video hardware */
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(pangofun)
- MDRV_VIDEO_UPDATE(pangofun)
+ MCFG_VIDEO_START(pangofun)
+ MCFG_VIDEO_UPDATE(pangofun)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 8c312fd4f93..6518459b588 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -375,35 +375,35 @@ static GFXDECODE_START( panicr )
GFXDECODE_END
static MACHINE_CONFIG_START( panicr, panicr_state )
- MDRV_CPU_ADD("maincpu", V20,MASTER_CLOCK/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */
- MDRV_CPU_PROGRAM_MAP(panicr_map)
- MDRV_CPU_VBLANK_INT_HACK(panicr_interrupt,2)
+ MCFG_CPU_ADD("maincpu", V20,MASTER_CLOCK/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */
+ MCFG_CPU_PROGRAM_MAP(panicr_map)
+ MCFG_CPU_VBLANK_INT_HACK(panicr_interrupt,2)
- MDRV_CPU_ADD(CPUTAG_T5182,Z80,SOUND_CLOCK/4) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(t5182_map)
- MDRV_CPU_IO_MAP(t5182_io)
+ MCFG_CPU_ADD(CPUTAG_T5182,Z80,SOUND_CLOCK/4) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(t5182_map)
+ MCFG_CPU_IO_MAP(t5182_io)
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(panicr)
- MDRV_PALETTE_LENGTH(256*3)
- MDRV_PALETTE_INIT(panicr)
+ MCFG_GFXDECODE(panicr)
+ MCFG_PALETTE_LENGTH(256*3)
+ MCFG_PALETTE_INIT(panicr)
- MDRV_VIDEO_START(panicr)
- MDRV_VIDEO_UPDATE(panicr)
+ MCFG_VIDEO_START(panicr)
+ MCFG_VIDEO_UPDATE(panicr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4) /* 3.579545 MHz */
- MDRV_SOUND_CONFIG(t5182_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4) /* 3.579545 MHz */
+ MCFG_SOUND_CONFIG(t5182_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index 4ffa0674f62..0123df954c1 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -565,71 +565,71 @@ static MACHINE_RESET( paradise )
static MACHINE_CONFIG_START( paradise, paradise_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */
- MDRV_CPU_PROGRAM_MAP(paradise_map)
- MDRV_CPU_IO_MAP(paradise_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No nmi routine */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */
+ MCFG_CPU_PROGRAM_MAP(paradise_map)
+ MCFG_CPU_IO_MAP(paradise_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No nmi routine */
- MDRV_MACHINE_START(paradise)
- MDRV_MACHINE_RESET(paradise)
+ MCFG_MACHINE_START(paradise)
+ MCFG_MACHINE_RESET(paradise)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54) /* 54 verified */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* we're using IPT_VBLANK */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-1-16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54) /* 54 verified */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* we're using IPT_VBLANK */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-1-16)
- MDRV_GFXDECODE(paradise)
- MDRV_PALETTE_LENGTH(0x800 + 16)
+ MCFG_GFXDECODE(paradise)
+ MCFG_PALETTE_LENGTH(0x800 + 16)
- MDRV_VIDEO_START(paradise)
- MDRV_VIDEO_UPDATE(paradise)
+ MCFG_VIDEO_START(paradise)
+ MCFG_VIDEO_UPDATE(paradise)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki2", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tgtball, paradise )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tgtball_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tgtball_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( torus, paradise )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(torus_map)
- MDRV_CPU_IO_MAP(torus_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(torus_map)
+ MCFG_CPU_IO_MAP(torus_io_map)
- MDRV_GFXDECODE(torus)
+ MCFG_GFXDECODE(torus)
- MDRV_VIDEO_UPDATE(torus)
+ MCFG_VIDEO_UPDATE(torus)
- MDRV_DEVICE_REMOVE("oki2")
+ MCFG_DEVICE_REMOVE("oki2")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( madball, paradise )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(torus_map)
- MDRV_CPU_IO_MAP(torus_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(torus_map)
+ MCFG_CPU_IO_MAP(torus_io_map)
- MDRV_GFXDECODE(madball)
+ MCFG_GFXDECODE(madball)
- MDRV_VIDEO_UPDATE(madball)
+ MCFG_VIDEO_UPDATE(madball)
- MDRV_DEVICE_REMOVE("oki2")
+ MCFG_DEVICE_REMOVE("oki2")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 347646f5724..1a23309f833 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -137,39 +137,39 @@ static const c6280_interface c6280_config =
static MACHINE_CONFIG_START( paranoia, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(pce_mem)
- MDRV_CPU_IO_MAP(pce_io)
- MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
+ MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
+ MCFG_CPU_PROGRAM_MAP(pce_mem)
+ MCFG_CPU_IO_MAP(pce_io)
+ MCFG_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
- MDRV_QUANTUM_TIME(HZ(60))
+ MCFG_QUANTUM_TIME(HZ(60))
- MDRV_CPU_ADD("sub", I8085A, 18000000/3)
- MDRV_CPU_PROGRAM_MAP(paranoia_8085_map)
- MDRV_CPU_IO_MAP(paranoia_8085_io_map)
+ MCFG_CPU_ADD("sub", I8085A, 18000000/3)
+ MCFG_CPU_PROGRAM_MAP(paranoia_8085_map)
+ MCFG_CPU_IO_MAP(paranoia_8085_io_map)
- MDRV_CPU_ADD("sub2", Z80, 18000000/6)
- MDRV_CPU_PROGRAM_MAP(paranoia_z80_map)
- MDRV_CPU_IO_MAP(paranoia_z80_io_map)
+ MCFG_CPU_ADD("sub2", Z80, 18000000/6)
+ MCFG_CPU_PROGRAM_MAP(paranoia_z80_map)
+ MCFG_CPU_IO_MAP(paranoia_z80_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242)
- /* MDRV_GFXDECODE( pce_gfxdecodeinfo ) */
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT( vce )
+ /* MCFG_GFXDECODE( pce_gfxdecodeinfo ) */
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT( vce )
- MDRV_VIDEO_START( pce )
- MDRV_VIDEO_UPDATE( pce )
+ MCFG_VIDEO_START( pce )
+ MCFG_VIDEO_UPDATE( pce )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MDRV_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
- MDRV_SOUND_CONFIG(c6280_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
+ MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
+ MCFG_SOUND_CONFIG(c6280_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index a4da0d20d16..805d504bad2 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -300,44 +300,44 @@ static MACHINE_RESET( parodius )
static MACHINE_CONFIG_START( parodius, parodius_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */
- MDRV_CPU_PROGRAM_MAP(parodius_map)
- MDRV_CPU_VBLANK_INT("screen", parodius_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */
+ MCFG_CPU_PROGRAM_MAP(parodius_map)
+ MCFG_CPU_VBLANK_INT("screen", parodius_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(parodius_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(parodius_sound_map)
/* NMIs are triggered by the 053260 */
- MDRV_MACHINE_START(parodius)
- MDRV_MACHINE_RESET(parodius)
+ MCFG_MACHINE_START(parodius)
+ MCFG_MACHINE_RESET(parodius)
/* 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(14*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(parodius)
+ MCFG_VIDEO_UPDATE(parodius)
- MDRV_K052109_ADD("k052109", parodius_k052109_intf)
- MDRV_K053245_ADD("k053245", parodius_k05324x_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", parodius_k052109_intf)
+ MCFG_K053245_ADD("k053245", parodius_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.70)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.70)
+ MCFG_SOUND_ADD("k053260", K053260, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index a3888a426a7..917c8f81b2e 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -400,36 +400,36 @@ static MACHINE_RESET( pasha2 )
static MACHINE_CONFIG_START( pasha2, pasha2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", E116XT, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(pasha2_map)
- MDRV_CPU_IO_MAP(pasha2_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", E116XT, 20000000*4) /* 4x internal multiplier */
+ MCFG_CPU_PROGRAM_MAP(pasha2_map)
+ MCFG_CPU_IO_MAP(pasha2_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(pasha2)
- MDRV_MACHINE_RESET(pasha2)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(pasha2)
+ MCFG_MACHINE_RESET(pasha2)
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 383, 0, 239)
+ 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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 383, 0, 239)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(pasha2)
- MDRV_VIDEO_UPDATE(pasha2)
+ MCFG_VIDEO_START(pasha2)
+ MCFG_VIDEO_UPDATE(pasha2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
//and ATMEL DREAM SAM9773
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index 82cb09c3140..dad8e2a3a2e 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -234,37 +234,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( pass, pass_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14318180/2 )
- MDRV_CPU_PROGRAM_MAP(pass_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) /* all the same */
+ MCFG_CPU_ADD("maincpu", M68000, 14318180/2 )
+ MCFG_CPU_PROGRAM_MAP(pass_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold) /* all the same */
- MDRV_CPU_ADD("audiocpu", Z80, 14318180/4 )
- MDRV_CPU_PROGRAM_MAP(pass_sound_map)
- MDRV_CPU_IO_MAP(pass_sound_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,60) /* probably not accurate, unknown timing and generation (ym2203 sound chip?). */
+ MCFG_CPU_ADD("audiocpu", Z80, 14318180/4 )
+ MCFG_CPU_PROGRAM_MAP(pass_sound_map)
+ MCFG_CPU_IO_MAP(pass_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,60) /* probably not accurate, unknown timing and generation (ym2203 sound chip?). */
/* 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(8*8, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 48*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_GFXDECODE(pass)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(pass)
- MDRV_VIDEO_START(pass)
- MDRV_VIDEO_UPDATE(pass)
+ MCFG_VIDEO_START(pass)
+ MCFG_VIDEO_UPDATE(pass)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 14318180/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 14318180/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_OKIM6295_ADD("oki", 792000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki", 792000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index d63a78d8d05..63791aacb17 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -408,38 +408,38 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( pastelg, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
- MDRV_CPU_PROGRAM_MAP(pastelg_map)
- MDRV_CPU_IO_MAP(pastelg_io_map)
-// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt,96) // nmiclock not written, chip is 1411M1 instead of 1413M3
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
+ MCFG_CPU_PROGRAM_MAP(pastelg_map)
+ MCFG_CPU_IO_MAP(pastelg_io_map)
+// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt,96) // nmiclock not written, chip is 1411M1 instead of 1413M3
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_MACHINE_RESET(nb1413m3)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(nb1413m3)
+ 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(pastelg)
- MDRV_VIDEO_START(pastelg)
- MDRV_VIDEO_UPDATE(pastelg)
+ MCFG_PALETTE_INIT(pastelg)
+ MCFG_VIDEO_START(pastelg)
+ MCFG_VIDEO_UPDATE(pastelg)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- 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
/*
@@ -468,37 +468,37 @@ Note
static MACHINE_CONFIG_START( threeds, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
- MDRV_CPU_PROGRAM_MAP(pastelg_map)
- MDRV_CPU_IO_MAP(threeds_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
+ MCFG_CPU_PROGRAM_MAP(pastelg_map)
+ MCFG_CPU_IO_MAP(threeds_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_MACHINE_RESET(nb1413m3)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(nb1413m3)
+ 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(pastelg)
- MDRV_VIDEO_START(pastelg)
- MDRV_VIDEO_UPDATE(pastelg)
+ MCFG_PALETTE_INIT(pastelg)
+ MCFG_VIDEO_START(pastelg)
+ MCFG_VIDEO_UPDATE(pastelg)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- 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
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index d305cc1004f..2299d4c9d10 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -272,44 +272,44 @@ static MACHINE_RESET( pbaction )
static MACHINE_CONFIG_START( pbaction, pbaction_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(pbaction_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
-
- MDRV_CPU_ADD("audiocpu", Z80, 3072000)
- MDRV_CPU_PROGRAM_MAP(pbaction_sound_map)
- MDRV_CPU_IO_MAP(pbaction_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(pbaction_interrupt,2) /* ??? */
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(pbaction_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
+
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000)
+ MCFG_CPU_PROGRAM_MAP(pbaction_sound_map)
+ MCFG_CPU_IO_MAP(pbaction_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(pbaction_interrupt,2) /* ??? */
/* IRQs are caused by the main CPU */
- MDRV_MACHINE_START(pbaction)
- MDRV_MACHINE_RESET(pbaction)
+ MCFG_MACHINE_START(pbaction)
+ MCFG_MACHINE_RESET(pbaction)
/* 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)
+ 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)
- MDRV_GFXDECODE(pbaction)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(pbaction)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(pbaction)
- MDRV_VIDEO_UPDATE(pbaction)
+ MCFG_VIDEO_START(pbaction)
+ MCFG_VIDEO_UPDATE(pbaction)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay3", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c
index 9122a1c88f4..e3d40ffacd3 100644
--- a/src/mame/drivers/pcat_dyn.c
+++ b/src/mame/drivers/pcat_dyn.c
@@ -511,35 +511,35 @@ GFXDECODE_END
static MACHINE_CONFIG_START( pcat_dyn, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I486, 40000000) /* Am486 DX-40 */
- MDRV_CPU_PROGRAM_MAP(pcat_map)
- MDRV_CPU_IO_MAP(pcat_io)
+ MCFG_CPU_ADD("maincpu", I486, 40000000) /* Am486 DX-40 */
+ MCFG_CPU_PROGRAM_MAP(pcat_map)
+ MCFG_CPU_IO_MAP(pcat_io)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE( pcat_dyn )
-
- MDRV_MACHINE_START(pcat_dyn)
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
-
-// MDRV_FRAGMENT_ADD( at_kbdc8042 )
- MDRV_PIC8259_ADD( "pic8259_1", pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", pic8259_2_config )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
- MDRV_PIT8254_ADD( "pit8254", at_pit8254_config )
-
- MDRV_PALETTE_INIT(pcat_286)
-
- MDRV_PALETTE_LENGTH(0x300)
-
- MDRV_VIDEO_START(pcat_dyn)
- MDRV_VIDEO_UPDATE(pcat_dyn)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
+ MCFG_GFXDECODE( pcat_dyn )
+
+ MCFG_MACHINE_START(pcat_dyn)
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
+
+// MCFG_FRAGMENT_ADD( at_kbdc8042 )
+ MCFG_PIC8259_ADD( "pic8259_1", pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_2", pic8259_2_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
+ MCFG_PIT8254_ADD( "pit8254", at_pit8254_config )
+
+ MCFG_PALETTE_INIT(pcat_286)
+
+ MCFG_PALETTE_LENGTH(0x300)
+
+ MCFG_VIDEO_START(pcat_dyn)
+ MCFG_VIDEO_UPDATE(pcat_dyn)
MACHINE_CONFIG_END
/***************************************
diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c
index 3dacba0a683..59603821724 100644
--- a/src/mame/drivers/pcat_nit.c
+++ b/src/mame/drivers/pcat_nit.c
@@ -225,23 +225,23 @@ static MACHINE_START( streetg2 )
static MACHINE_CONFIG_START( pcat_nit, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
- MDRV_CPU_PROGRAM_MAP(pcat_map)
- MDRV_CPU_IO_MAP(pcat_nit_io)
+ MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
+ MCFG_CPU_PROGRAM_MAP(pcat_map)
+ MCFG_CPU_IO_MAP(pcat_nit_io)
/* video hardware */
- MDRV_FRAGMENT_ADD( pcvideo_vga )
+ MCFG_FRAGMENT_ADD( pcvideo_vga )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MDRV_MACHINE_START(streetg2)
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_MACHINE_START(streetg2)
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
-// MDRV_FRAGMENT_ADD( at_kbdc8042 )
- MDRV_FRAGMENT_ADD( pcat_common )
- MDRV_NS16450_ADD( "ns16450_0", pcat_nit_com0_interface )
+// MCFG_FRAGMENT_ADD( at_kbdc8042 )
+ MCFG_FRAGMENT_ADD( pcat_common )
+ MCFG_NS16450_ADD( "ns16450_0", pcat_nit_com0_interface )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 2161f4286a7..97a79d61827 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -218,47 +218,47 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( pcktgal, pcktgal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 2000000)
- MDRV_CPU_PROGRAM_MAP(pcktgal_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, 2000000)
+ MCFG_CPU_PROGRAM_MAP(pcktgal_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(pcktgal_sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(pcktgal_sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
/* 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)
+ 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)
- MDRV_GFXDECODE(pcktgal)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(pcktgal)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(pcktgal)
- MDRV_VIDEO_START(pcktgal)
- MDRV_VIDEO_UPDATE(pcktgal)
+ MCFG_PALETTE_INIT(pcktgal)
+ MCFG_VIDEO_START(pcktgal)
+ MCFG_VIDEO_UPDATE(pcktgal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bootleg, pcktgal )
- MDRV_GFXDECODE(bootleg)
+ MCFG_GFXDECODE(bootleg)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c
index f107a8e9a83..2a34a670f89 100644
--- a/src/mame/drivers/pcxt.c
+++ b/src/mame/drivers/pcxt.c
@@ -918,94 +918,94 @@ static MACHINE_RESET( filetto )
}
static MACHINE_CONFIG_START( filetto, driver_device )
- MDRV_CPU_ADD("maincpu", I8088, 8000000) //or regular PC-XT 14318180/3 clock?
- MDRV_CPU_PROGRAM_MAP(filetto_map)
- MDRV_CPU_IO_MAP(filetto_io)
+ MCFG_CPU_ADD("maincpu", I8088, 8000000) //or regular PC-XT 14318180/3 clock?
+ MCFG_CPU_PROGRAM_MAP(filetto_map)
+ MCFG_CPU_IO_MAP(filetto_io)
- MDRV_MACHINE_RESET( filetto )
+ MCFG_MACHINE_RESET( filetto )
- MDRV_PIT8253_ADD( "pit8253", pc_pit8253_config )
+ MCFG_PIT8253_ADD( "pit8253", pc_pit8253_config )
- MDRV_PPI8255_ADD( "ppi8255_0", filetto_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", filetto_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", filetto_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", filetto_ppi8255_intf[1] )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_PIC8259_ADD( "pic8259_1", pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_1", pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", pic8259_2_config )
+ MCFG_PIC8259_ADD( "pic8259_2", pic8259_2_config )
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
- MDRV_GFXDECODE(filetto)
+ MCFG_GFXDECODE(filetto)
- 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 640-1, 0*8, 480-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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 640-1, 0*8, 480-1)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_PALETTE_INIT(filetto)
+ MCFG_PALETTE_INIT(filetto)
- MDRV_VIDEO_START(filetto)
- MDRV_VIDEO_UPDATE(filetto)
+ MCFG_VIDEO_START(filetto)
+ MCFG_VIDEO_UPDATE(filetto)
/*Sound Hardware*/
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("voice", HC55516, 8000000/4)//8923S-UM5100 is a HC55536 with ROM hook-up
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("voice", HC55516, 8000000/4)//8923S-UM5100 is a HC55536 with ROM hook-up
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
// PC "buzzer" sound
- MDRV_SOUND_ADD("beep", BEEP, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("beep", BEEP, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tetriskr, driver_device )
- MDRV_CPU_ADD("maincpu", I8088, 14318180/3)
- MDRV_CPU_PROGRAM_MAP(filetto_map)
- MDRV_CPU_IO_MAP(tetriskr_io)
+ MCFG_CPU_ADD("maincpu", I8088, 14318180/3)
+ MCFG_CPU_PROGRAM_MAP(filetto_map)
+ MCFG_CPU_IO_MAP(tetriskr_io)
- MDRV_MACHINE_RESET( filetto )
+ MCFG_MACHINE_RESET( filetto )
- MDRV_PIT8253_ADD( "pit8253", pc_pit8253_config )
+ MCFG_PIT8253_ADD( "pit8253", pc_pit8253_config )
- MDRV_PPI8255_ADD( "ppi8255_0", filetto_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", filetto_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", filetto_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", filetto_ppi8255_intf[1] )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_PIC8259_ADD( "pic8259_1", pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_1", pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", pic8259_2_config )
+ MCFG_PIC8259_ADD( "pic8259_2", pic8259_2_config )
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
- MDRV_GFXDECODE(tetriskr)
+ MCFG_GFXDECODE(tetriskr)
- 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 640-1, 0*8, 480-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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 640-1, 0*8, 480-1)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_PALETTE_INIT(filetto)
+ MCFG_PALETTE_INIT(filetto)
- MDRV_VIDEO_START(tetriskr)
- MDRV_VIDEO_UPDATE(tetriskr)
+ MCFG_VIDEO_START(tetriskr)
+ MCFG_VIDEO_UPDATE(tetriskr)
/*Sound Hardware*/
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
// PC "buzzer" sound
- MDRV_SOUND_ADD("beep", BEEP, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("beep", BEEP, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
ROM_START( filetto )
diff --git a/src/mame/drivers/pengadvb.c b/src/mame/drivers/pengadvb.c
index ce010c8fa17..6cc918361a1 100644
--- a/src/mame/drivers/pengadvb.c
+++ b/src/mame/drivers/pengadvb.c
@@ -268,28 +268,28 @@ static INTERRUPT_GEN( pengadvb_interrupt )
static MACHINE_CONFIG_START( pengadvb, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) /* 3.579545 Mhz */
- MDRV_CPU_PROGRAM_MAP(program_mem)
- MDRV_CPU_IO_MAP(io_mem)
- MDRV_CPU_VBLANK_INT("screen",pengadvb_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) /* 3.579545 Mhz */
+ MCFG_CPU_PROGRAM_MAP(program_mem)
+ MCFG_CPU_IO_MAP(io_mem)
+ MCFG_CPU_VBLANK_INT("screen",pengadvb_interrupt)
- MDRV_MACHINE_START( pengadvb )
- MDRV_MACHINE_RESET( pengadvb )
+ MCFG_MACHINE_START( pengadvb )
+ MCFG_MACHINE_RESET( pengadvb )
- MDRV_I8255A_ADD( "ppi8255", pengadvb_ppi8255_interface)
+ MCFG_I8255A_ADD( "ppi8255", pengadvb_ppi8255_interface)
/* video hardware */
- MDRV_FRAGMENT_ADD(tms9928a)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE((float)XTAL_10_738635MHz/2/342/262)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(4395)) /* 69 lines */
+ MCFG_FRAGMENT_ADD(tms9928a)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE((float)XTAL_10_738635MHz/2/342/262)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(4395)) /* 69 lines */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, (float)XTAL_10_738635MHz/6)
- MDRV_SOUND_CONFIG(pengadvb_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, (float)XTAL_10_738635MHz/6)
+ MCFG_SOUND_CONFIG(pengadvb_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static void pengadvb_decrypt(running_machine *machine, const char* region)
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index aa638574cbf..64efba74975 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -347,28 +347,28 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( pengo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(pengo_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
+ MCFG_CPU_PROGRAM_MAP(pengo_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_GFXDECODE(pengo)
- MDRV_PALETTE_LENGTH(128*4)
+ MCFG_GFXDECODE(pengo)
+ MCFG_PALETTE_LENGTH(128*4)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(pacman)
- MDRV_VIDEO_START(pengo)
- MDRV_VIDEO_UPDATE(pacman)
+ MCFG_PALETTE_INIT(pacman)
+ MCFG_VIDEO_START(pengo)
+ MCFG_VIDEO_UPDATE(pacman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -377,10 +377,10 @@ static MACHINE_CONFIG_DERIVED( jrpacmbl, pengo )
/* basic machine hardware */
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jrpacmbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(jrpacmbl_map)
- MDRV_VIDEO_START(jrpacman)
+ MCFG_VIDEO_START(jrpacman)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index dffd4ac8c67..05206a7953e 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -1017,35 +1017,35 @@ static MACHINE_RESET( peplus )
static MACHINE_CONFIG_START( peplus, peplus_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", I80C32, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(peplus_map)
- MDRV_CPU_IO_MAP(peplus_iomap)
+ MCFG_CPU_ADD("maincpu", I80C32, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(peplus_map)
+ MCFG_CPU_IO_MAP(peplus_iomap)
- MDRV_MACHINE_RESET(peplus)
- MDRV_NVRAM_ADD_0FILL("cmos")
+ MCFG_MACHINE_RESET(peplus)
+ MCFG_NVRAM_ADD_0FILL("cmos")
// video hardware
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE((52+1)*8, (31+1)*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 25*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE((52+1)*8, (31+1)*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 25*8-1)
- MDRV_GFXDECODE(peplus)
- MDRV_PALETTE_LENGTH(16*16*2)
+ MCFG_GFXDECODE(peplus)
+ MCFG_PALETTE_LENGTH(16*16*2)
- MDRV_MC6845_ADD("crtc", R6545_1, MC6845_CLOCK, mc6845_intf)
- MDRV_I2CMEM_ADD("i2cmem", i2cmem_interface)
+ MCFG_MC6845_ADD("crtc", R6545_1, MC6845_CLOCK, mc6845_intf)
+ MCFG_I2CMEM_ADD("i2cmem", i2cmem_interface)
- MDRV_PALETTE_INIT(peplus)
- MDRV_VIDEO_START(peplus)
- MDRV_VIDEO_UPDATE(peplus)
+ MCFG_PALETTE_INIT(peplus)
+ MCFG_VIDEO_START(peplus)
+ MCFG_VIDEO_UPDATE(peplus)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8912, SOUND_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("aysnd", AY8912, SOUND_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index d11cf7aa264..c5a4c9c68b9 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -1372,55 +1372,55 @@ static MACHINE_RESET( pgm )
static MACHINE_CONFIG_START( pgm, pgm_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 20000000) /* 20 mhz! verified on real board */
- MDRV_CPU_PROGRAM_MAP(pgm_mem)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 20000000) /* 20 mhz! verified on real board */
+ MCFG_CPU_PROGRAM_MAP(pgm_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, 33868800/4)
- MDRV_CPU_PROGRAM_MAP(z80_mem)
- MDRV_CPU_IO_MAP(z80_io)
+ MCFG_CPU_ADD("soundcpu", Z80, 33868800/4)
+ MCFG_CPU_PROGRAM_MAP(z80_mem)
+ MCFG_CPU_IO_MAP(z80_io)
- MDRV_MACHINE_START( pgm )
- MDRV_MACHINE_RESET( pgm )
- MDRV_NVRAM_ADD_0FILL("sram")
+ MCFG_MACHINE_START( pgm )
+ MCFG_MACHINE_RESET( pgm )
+ MCFG_NVRAM_ADD_0FILL("sram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60) // killing blade won't boot (just displays 'error') if this is lower than 59.9 or higher than 60.1 .. are actual PGM boards different to the Cave one?
- 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, 56*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60) // killing blade won't boot (just displays 'error') if this is lower than 59.9 or higher than 60.1 .. are actual PGM boards different to the Cave one?
+ 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, 56*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(pgm)
- MDRV_PALETTE_LENGTH(0x1200/2)
+ MCFG_GFXDECODE(pgm)
+ MCFG_PALETTE_LENGTH(0x1200/2)
- MDRV_VIDEO_START(pgm)
- MDRV_VIDEO_EOF(pgm)
- MDRV_VIDEO_UPDATE(pgm)
+ MCFG_VIDEO_START(pgm)
+ MCFG_VIDEO_EOF(pgm)
+ MCFG_VIDEO_UPDATE(pgm)
/*sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_ICS2115_ADD("ics", 0, sound_irq)
-// MDRV_SOUND_ADD("ics", ICS2115, 0)
-// MDRV_SOUND_CONFIG(pgm_ics2115_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_ICS2115_ADD("ics", 0, sound_irq)
+// MCFG_SOUND_ADD("ics", ICS2115, 0)
+// MCFG_SOUND_CONFIG(pgm_ics2115_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( drgw2, pgm )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
MACHINE_CONFIG_END
static MACHINE_RESET( killbld );
static MACHINE_CONFIG_DERIVED( killbld, pgm )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(killbld_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(killbld_mem)
- MDRV_MACHINE_RESET(killbld)
+ MCFG_MACHINE_RESET(killbld)
MACHINE_CONFIG_END
@@ -1428,11 +1428,11 @@ static MACHINE_RESET( dw3 );
static MACHINE_CONFIG_DERIVED( dw3, pgm )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(killbld_mem)
- MDRV_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(killbld_mem)
+ MCFG_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
- MDRV_MACHINE_RESET(dw3)
+ MCFG_MACHINE_RESET(dw3)
MACHINE_CONFIG_END
@@ -1440,55 +1440,55 @@ static MACHINE_RESET( olds );
static MACHINE_CONFIG_DERIVED( olds, pgm )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(olds_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(olds_mem)
- MDRV_MACHINE_RESET(olds)
+ MCFG_MACHINE_RESET(olds)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kov, pgm )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kovsh_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(kovsh_mem)
/* protection CPU */
- MDRV_CPU_ADD("prot", ARM7, 20000000) // 55857E/F/G
- MDRV_CPU_PROGRAM_MAP(kovsh_arm7_map)
+ MCFG_CPU_ADD("prot", ARM7, 20000000) // 55857E/F/G
+ MCFG_CPU_PROGRAM_MAP(kovsh_arm7_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kov_disabled_arm, pgm )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kovsh_mem)
- MDRV_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(kovsh_mem)
+ MCFG_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
/* protection CPU */
- MDRV_CPU_ADD("prot", ARM7, 20000000) // 55857E/F/G
- MDRV_CPU_PROGRAM_MAP(kovsh_arm7_map)
- MDRV_DEVICE_DISABLE()
+ MCFG_CPU_ADD("prot", ARM7, 20000000) // 55857E/F/G
+ MCFG_CPU_PROGRAM_MAP(kovsh_arm7_map)
+ MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kov2, pgm )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kov2_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(kov2_mem)
/* protection CPU */
- MDRV_CPU_ADD("prot", ARM7, 20000000) // 55857F
- MDRV_CPU_PROGRAM_MAP(arm7_map)
+ MCFG_CPU_ADD("prot", ARM7, 20000000) // 55857F
+ MCFG_CPU_PROGRAM_MAP(arm7_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( svg, pgm )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(svg_68k_mem)
- MDRV_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(svg_68k_mem)
+ MCFG_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
/* protection CPU */
- MDRV_CPU_ADD("prot", ARM7, 20000000) // 55857G
- MDRV_CPU_PROGRAM_MAP(svg_arm7_map)
+ MCFG_CPU_ADD("prot", ARM7, 20000000) // 55857G
+ MCFG_CPU_PROGRAM_MAP(svg_arm7_map)
MACHINE_CONFIG_END
class cavepgm_state : public pgm_state
@@ -1524,40 +1524,40 @@ static MACHINE_START( cavepgm )
static MACHINE_CONFIG_START( cavepgm, cavepgm_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 20000000)
+ MCFG_CPU_ADD("maincpu", M68000, 20000000)
- MDRV_CPU_PROGRAM_MAP(cavepgm_mem)
- MDRV_CPU_VBLANK_INT_HACK(drgw_interrupt,2)
+ MCFG_CPU_PROGRAM_MAP(cavepgm_mem)
+ MCFG_CPU_VBLANK_INT_HACK(drgw_interrupt,2)
- MDRV_CPU_ADD("soundcpu", Z80, 33868800/4)
- MDRV_CPU_PROGRAM_MAP(z80_mem)
- MDRV_CPU_IO_MAP(z80_io)
+ MCFG_CPU_ADD("soundcpu", Z80, 33868800/4)
+ MCFG_CPU_PROGRAM_MAP(z80_mem)
+ MCFG_CPU_IO_MAP(z80_io)
- MDRV_MACHINE_START( cavepgm )
- MDRV_MACHINE_RESET( pgm )
- MDRV_NVRAM_ADD_0FILL("sram")
+ MCFG_MACHINE_START( cavepgm )
+ MCFG_MACHINE_RESET( pgm )
+ MCFG_NVRAM_ADD_0FILL("sram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.17) // verified on pcb
- 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, 56*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.17) // verified on pcb
+ 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, 56*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(pgm)
- MDRV_PALETTE_LENGTH(0x1200/2)
+ MCFG_GFXDECODE(pgm)
+ MCFG_PALETTE_LENGTH(0x1200/2)
- MDRV_VIDEO_START(pgm)
- MDRV_VIDEO_EOF(pgm)
- MDRV_VIDEO_UPDATE(pgm)
+ MCFG_VIDEO_START(pgm)
+ MCFG_VIDEO_EOF(pgm)
+ MCFG_VIDEO_UPDATE(pgm)
/*sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_ICS2115_ADD("ics", 0, sound_irq)
- //MDRV_SOUND_ADD("ics", ICS2115, 0)
- //MDRV_SOUND_CONFIG(pgm_ics2115_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_ICS2115_ADD("ics", 0, sound_irq)
+ //MCFG_SOUND_ADD("ics", ICS2115, 0)
+ //MCFG_SOUND_CONFIG(pgm_ics2115_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
/*** Rom Loading *************************************************************/
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index ae3938c5f6f..10a7ca1a6ed 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -453,59 +453,59 @@ static MACHINE_RESET( phoenix )
static MACHINE_CONFIG_START( phoenix, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 2.75 MHz */
- MDRV_CPU_PROGRAM_MAP(phoenix_memory_map)
+ MCFG_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 2.75 MHz */
+ MCFG_CPU_PROGRAM_MAP(phoenix_memory_map)
- MDRV_MACHINE_RESET(phoenix)
+ MCFG_MACHINE_RESET(phoenix)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_GFXDECODE(phoenix)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(phoenix)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(phoenix)
- MDRV_VIDEO_START(phoenix)
- MDRV_VIDEO_UPDATE(phoenix)
+ MCFG_PALETTE_INIT(phoenix)
+ MCFG_VIDEO_START(phoenix)
+ MCFG_VIDEO_UPDATE(phoenix)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("tms", TMS36XX, 372)
- MDRV_SOUND_CONFIG(phoenix_tms36xx_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("tms", TMS36XX, 372)
+ MCFG_SOUND_CONFIG(phoenix_tms36xx_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD("cust", PHOENIX, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SOUND_ADD("cust", PHOENIX, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MDRV_SOUND_ADD("discrete", DISCRETE, 120000)
- MDRV_SOUND_CONFIG_DISCRETE(phoenix)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 120000)
+ MCFG_SOUND_CONFIG_DISCRETE(phoenix)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pleiads, phoenix )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pleiads_memory_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pleiads_memory_map)
/* video hardware */
- MDRV_GFXDECODE(pleiads)
+ MCFG_GFXDECODE(pleiads)
- MDRV_PALETTE_INIT(pleiads)
+ MCFG_PALETTE_INIT(pleiads)
/* sound hardware */
- MDRV_SOUND_REPLACE("tms", TMS36XX, 247)
- MDRV_SOUND_CONFIG(pleiads_tms36xx_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_REPLACE("tms", TMS36XX, 247)
+ MCFG_SOUND_CONFIG(pleiads_tms36xx_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_REPLACE("cust", PLEIADS, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_REPLACE("cust", PLEIADS, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_DEVICE_REMOVE("discrete")
+ MCFG_DEVICE_REMOVE("discrete")
MACHINE_CONFIG_END
@@ -522,35 +522,35 @@ static I8085_CONFIG( survival_i8085_config )
static MACHINE_CONFIG_START( survival, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 5.50 MHz */
- MDRV_CPU_CONFIG(survival_i8085_config)
- MDRV_CPU_PROGRAM_MAP(survival_memory_map)
+ MCFG_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 5.50 MHz */
+ MCFG_CPU_CONFIG(survival_i8085_config)
+ MCFG_CPU_PROGRAM_MAP(survival_memory_map)
- MDRV_MACHINE_RESET(phoenix)
+ MCFG_MACHINE_RESET(phoenix)
/* video hardware */
/* schematics fairly identical to phoenix, however the interesting
* page is missing
*/
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_GFXDECODE(phoenix)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(phoenix)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(survival)
- MDRV_VIDEO_START(phoenix)
- MDRV_VIDEO_UPDATE(phoenix)
+ MCFG_PALETTE_INIT(survival)
+ MCFG_VIDEO_START(phoenix)
+ MCFG_VIDEO_UPDATE(phoenix)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* FIXME: check clock */
- MDRV_SOUND_ADD("aysnd", AY8910, 11000000/4)
- MDRV_SOUND_CONFIG(survival_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 11000000/4)
+ MCFG_SOUND_CONFIG(survival_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -559,8 +559,8 @@ static MACHINE_CONFIG_DERIVED( condor, phoenix )
/* basic machine hardware */
/* FIXME: Verify clock. This is most likely 11MHz/2 */
- MDRV_CPU_REPLACE("maincpu", Z80, 11000000/4) /* 2.75 MHz??? */
- MDRV_CPU_PROGRAM_MAP(phoenix_memory_map)
+ MCFG_CPU_REPLACE("maincpu", Z80, 11000000/4) /* 2.75 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(phoenix_memory_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c
index 21d11c5d723..ac7473f8265 100644
--- a/src/mame/drivers/photon.c
+++ b/src/mame/drivers/photon.c
@@ -195,33 +195,33 @@ static VIDEO_UPDATE( photon )
static MACHINE_CONFIG_START( photon, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",I8080, 1780000)
- MDRV_CPU_PROGRAM_MAP(pk8000_mem)
- MDRV_CPU_IO_MAP(pk8000_io)
- MDRV_CPU_VBLANK_INT("screen", pk8000_interrupt)
+ MCFG_CPU_ADD("maincpu",I8080, 1780000)
+ MCFG_CPU_PROGRAM_MAP(pk8000_mem)
+ MCFG_CPU_IO_MAP(pk8000_io)
+ MCFG_CPU_VBLANK_INT("screen", pk8000_interrupt)
- MDRV_MACHINE_RESET(pk8000)
+ MCFG_MACHINE_RESET(pk8000)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256+32, 192+32)
- MDRV_SCREEN_VISIBLE_AREA(0, 256+32-1, 0, 192+32-1)
- MDRV_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(pk8000)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256+32, 192+32)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256+32-1, 0, 192+32-1)
+ MCFG_PALETTE_LENGTH(16)
+ MCFG_PALETTE_INIT(pk8000)
- MDRV_VIDEO_START(photon)
- MDRV_VIDEO_UPDATE(photon)
+ MCFG_VIDEO_START(photon)
+ MCFG_VIDEO_UPDATE(photon)
- MDRV_I8255A_ADD( "ppi8255_1", pk8000_ppi8255_interface_1 )
- MDRV_I8255A_ADD( "ppi8255_2", pk8000_ppi8255_interface_2 )
+ MCFG_I8255A_ADD( "ppi8255_1", pk8000_ppi8255_interface_1 )
+ MCFG_I8255A_ADD( "ppi8255_2", pk8000_ppi8255_interface_2 )
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c
index 84d4a7937bb..0628aa5e09c 100644
--- a/src/mame/drivers/photon2.c
+++ b/src/mame/drivers/photon2.c
@@ -298,32 +298,32 @@ static MACHINE_RESET( photon2 )
static MACHINE_CONFIG_START( photon2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3500000) /* 3.5 MHz */
- MDRV_CPU_PROGRAM_MAP(spectrum_mem)
- MDRV_CPU_IO_MAP(spectrum_io)
- MDRV_CPU_VBLANK_INT_HACK(spec_interrupt_hack, 2)
- MDRV_QUANTUM_TIME(HZ(60))
+ MCFG_CPU_ADD("maincpu", Z80, 3500000) /* 3.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(spectrum_mem)
+ MCFG_CPU_IO_MAP(spectrum_io)
+ MCFG_CPU_VBLANK_INT_HACK(spec_interrupt_hack, 2)
+ MCFG_QUANTUM_TIME(HZ(60))
- MDRV_MACHINE_RESET( photon2 )
+ MCFG_MACHINE_RESET( photon2 )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50.08)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(SPEC_SCREEN_WIDTH, SPEC_SCREEN_HEIGHT)
- MDRV_SCREEN_VISIBLE_AREA(0, SPEC_SCREEN_WIDTH-1, 0, SPEC_SCREEN_HEIGHT-1)
- MDRV_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT( spectrum )
-
- MDRV_VIDEO_START( spectrum )
- MDRV_VIDEO_UPDATE( spectrum )
- MDRV_VIDEO_EOF( spectrum )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50.08)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(SPEC_SCREEN_WIDTH, SPEC_SCREEN_HEIGHT)
+ MCFG_SCREEN_VISIBLE_AREA(0, SPEC_SCREEN_WIDTH-1, 0, SPEC_SCREEN_HEIGHT-1)
+ MCFG_PALETTE_LENGTH(16)
+ MCFG_PALETTE_INIT( spectrum )
+
+ MCFG_VIDEO_START( spectrum )
+ MCFG_VIDEO_UPDATE( spectrum )
+ MCFG_VIDEO_EOF( spectrum )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/photoply.c b/src/mame/drivers/photoply.c
index 83216cb3726..6151d0d7b70 100644
--- a/src/mame/drivers/photoply.c
+++ b/src/mame/drivers/photoply.c
@@ -496,36 +496,36 @@ GFXDECODE_END
static MACHINE_CONFIG_START( photoply, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I486, 75000000) /* I486DX4, 75 or 100 Mhz */
- MDRV_CPU_PROGRAM_MAP(photoply_map)
- MDRV_CPU_IO_MAP(photoply_io)
+ MCFG_CPU_ADD("maincpu", I486, 75000000) /* I486DX4, 75 or 100 Mhz */
+ MCFG_CPU_PROGRAM_MAP(photoply_map)
+ MCFG_CPU_IO_MAP(photoply_io)
/* video hardware */
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE( photoply )
+ MCFG_GFXDECODE( photoply )
- MDRV_MACHINE_START(photoply)
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_MACHINE_START(photoply)
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
-// MDRV_FRAGMENT_ADD( at_kbdc8042 )
- MDRV_PIC8259_ADD( "pic8259_1", pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", pic8259_2_config )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
- MDRV_PIT8254_ADD( "pit8254", at_pit8254_config )
+// MCFG_FRAGMENT_ADD( at_kbdc8042 )
+ MCFG_PIC8259_ADD( "pic8259_1", pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_2", pic8259_2_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
+ MCFG_PIT8254_ADD( "pit8254", at_pit8254_config )
- MDRV_PALETTE_INIT(pcat_286)
+ MCFG_PALETTE_INIT(pcat_286)
- MDRV_PALETTE_LENGTH(0x300)
+ MCFG_PALETTE_LENGTH(0x300)
- MDRV_VIDEO_START(photoply)
- MDRV_VIDEO_UPDATE(photoply)
+ MCFG_VIDEO_START(photoply)
+ MCFG_VIDEO_UPDATE(photoply)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index cbb7aea1a10..5d96dc22540 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -452,39 +452,39 @@ GFXDECODE_END
static MACHINE_CONFIG_START( pingpong, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,18432000/6) /* 3.072 MHz (probably) */
- MDRV_CPU_PROGRAM_MAP(pingpong_map)
- MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,16) /* 1 IRQ + 8 NMI */
+ MCFG_CPU_ADD("maincpu",Z80,18432000/6) /* 3.072 MHz (probably) */
+ MCFG_CPU_PROGRAM_MAP(pingpong_map)
+ MCFG_CPU_VBLANK_INT_HACK(pingpong_interrupt,16) /* 1 IRQ + 8 NMI */
/* 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)
+ 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)
- MDRV_GFXDECODE(pingpong)
- MDRV_PALETTE_LENGTH(64*4+64*4)
+ MCFG_GFXDECODE(pingpong)
+ MCFG_PALETTE_LENGTH(64*4+64*4)
- MDRV_PALETTE_INIT(pingpong)
- MDRV_VIDEO_START(pingpong)
- MDRV_VIDEO_UPDATE(pingpong)
+ MCFG_PALETTE_INIT(pingpong)
+ MCFG_VIDEO_START(pingpong)
+ MCFG_VIDEO_UPDATE(pingpong)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76496, 18432000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76496, 18432000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* too fast! */
static MACHINE_CONFIG_DERIVED( merlinmm, pingpong )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(merlinmm_map)
- MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(merlinmm_map)
+ MCFG_CPU_VBLANK_INT_HACK(pingpong_interrupt,2)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index c70a41b93b8..3f4513b5be1 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -1108,30 +1108,30 @@ static GFXDECODE_START( pinkiri8 )
GFXDECODE_END
static MACHINE_CONFIG_START( pinkiri8, driver_device )
- MDRV_CPU_ADD("maincpu",Z180,16000000)
- MDRV_CPU_PROGRAM_MAP(pinkiri8_map)
- MDRV_CPU_IO_MAP(pinkiri8_io)
- MDRV_CPU_VBLANK_INT("screen",nmi_line_assert)
+ MCFG_CPU_ADD("maincpu",Z180,16000000)
+ MCFG_CPU_PROGRAM_MAP(pinkiri8_map)
+ MCFG_CPU_IO_MAP(pinkiri8_io)
+ MCFG_CPU_VBLANK_INT("screen",nmi_line_assert)
- 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, 64*8-1, 0*8, 64*8-1)
- MDRV_GFXDECODE(pinkiri8)
- MDRV_PALETTE_LENGTH(0x2000)
+ 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, 64*8-1, 0*8, 64*8-1)
+ MCFG_GFXDECODE(pinkiri8)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(pinkiri8)
- MDRV_VIDEO_UPDATE(pinkiri8)
+ MCFG_VIDEO_START(pinkiri8)
+ MCFG_VIDEO_UPDATE(pinkiri8)
- MDRV_DEVICE_ADD("janshivdp", JANSHIVDP, 0)
+ MCFG_DEVICE_ADD("janshivdp", JANSHIVDP, 0)
/* 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", 0.5)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 6ffe76fe41e..189e6a4b95f 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -636,80 +636,80 @@ static MACHINE_RESET( pipedrm )
static MACHINE_CONFIG_START( pipedrm, fromance_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,14318000/4)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("sub", Z80,14318000/4)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_START(pipedrm)
- MDRV_MACHINE_RESET(pipedrm)
+ MCFG_MACHINE_START(pipedrm)
+ MCFG_MACHINE_RESET(pipedrm)
/* 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(44*8, 30*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
+ 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(44*8, 30*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(pipedrm)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(pipedrm)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(pipedrm)
- MDRV_VIDEO_UPDATE(pipedrm)
+ MCFG_VIDEO_START(pipedrm)
+ MCFG_VIDEO_UPDATE(pipedrm)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hatris, fromance_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,14318000/4)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(hatris_sound_portmap)
+ MCFG_CPU_ADD("sub", Z80,14318000/4)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(hatris_sound_portmap)
- MDRV_MACHINE_START(pipedrm)
- MDRV_MACHINE_RESET(pipedrm)
+ MCFG_MACHINE_START(pipedrm)
+ MCFG_MACHINE_RESET(pipedrm)
/* 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(44*8, 30*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
+ 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(44*8, 30*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(hatris)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(hatris)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(hatris)
- MDRV_VIDEO_UPDATE(fromance)
+ MCFG_VIDEO_START(hatris)
+ MCFG_VIDEO_UPDATE(fromance)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2608, 8000000)
- MDRV_SOUND_CONFIG(ym2608_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2608, 8000000)
+ MCFG_SOUND_CONFIG(ym2608_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 9555c05f7f4..59925c4283d 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -363,45 +363,45 @@ static PALETTE_INIT(pipeline)
static MACHINE_CONFIG_START( pipeline, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 7372800/2)
- MDRV_CPU_PROGRAM_MAP(cpu0_mem)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 7372800/2)
+ MCFG_CPU_PROGRAM_MAP(cpu0_mem)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80, 7372800/2)
- MDRV_CPU_CONFIG(daisy_chain_sound)
- MDRV_CPU_PROGRAM_MAP(cpu1_mem)
- MDRV_CPU_IO_MAP(sound_port)
+ MCFG_CPU_ADD("audiocpu", Z80, 7372800/2)
+ MCFG_CPU_CONFIG(daisy_chain_sound)
+ MCFG_CPU_PROGRAM_MAP(cpu1_mem)
+ MCFG_CPU_IO_MAP(sound_port)
- MDRV_CPU_ADD("mcu", M68705, 7372800/2)
- MDRV_CPU_PROGRAM_MAP(mcu_mem)
+ MCFG_CPU_ADD("mcu", M68705, 7372800/2)
+ MCFG_CPU_PROGRAM_MAP(mcu_mem)
- MDRV_Z80CTC_ADD( "ctc", 7372800/2 /* same as "audiocpu" */, ctc_intf )
+ MCFG_Z80CTC_ADD( "ctc", 7372800/2 /* same as "audiocpu" */, ctc_intf )
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 16, 239)
+ 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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 16, 239)
- MDRV_GFXDECODE(pipeline)
+ MCFG_GFXDECODE(pipeline)
- MDRV_PALETTE_INIT(pipeline)
- MDRV_PALETTE_LENGTH(0x100+0x100)
+ MCFG_PALETTE_INIT(pipeline)
+ MCFG_PALETTE_LENGTH(0x100+0x100)
- MDRV_VIDEO_START(pipeline)
- MDRV_VIDEO_UPDATE(pipeline)
+ MCFG_VIDEO_START(pipeline)
+ MCFG_VIDEO_UPDATE(pipeline)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 7372800/4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 7372800/4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 83f79f04540..6580c5d7932 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -261,31 +261,31 @@ GFXDECODE_END
/* Machine Driver + Related bits */
static MACHINE_CONFIG_START( pirates, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz */
- MDRV_CPU_PROGRAM_MAP(pirates_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz */
+ MCFG_CPU_PROGRAM_MAP(pirates_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_GFXDECODE(pirates)
+ MCFG_GFXDECODE(pirates)
- 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(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*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(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(pirates)
- MDRV_VIDEO_UPDATE(pirates)
+ MCFG_VIDEO_START(pirates)
+ MCFG_VIDEO_UPDATE(pirates)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 22af290541e..c041aa1b216 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -229,46 +229,46 @@ static GFXDECODE_START( pitnrun )
GFXDECODE_END
static MACHINE_CONFIG_START( pitnrun, pitnrun_state )
- MDRV_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pitnrun_map)
- MDRV_CPU_VBLANK_INT("screen", pitnrun_nmi_source)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(pitnrun_map)
+ MCFG_CPU_VBLANK_INT("screen", pitnrun_nmi_source)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_5MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pitnrun_sound_map)
- MDRV_CPU_IO_MAP(pitnrun_sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_5MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(pitnrun_sound_map)
+ MCFG_CPU_IO_MAP(pitnrun_sound_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pitnrun_mcu_map)
+ MCFG_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(pitnrun_mcu_map)
- MDRV_MACHINE_RESET(pitnrun)
+ MCFG_MACHINE_RESET(pitnrun)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
-
- MDRV_GFXDECODE(pitnrun)
- MDRV_PALETTE_LENGTH(32*3)
- MDRV_PALETTE_INIT(pitnrun)
- MDRV_VIDEO_START(pitnrun)
- MDRV_VIDEO_UPDATE(pitnrun)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+
+ MCFG_GFXDECODE(pitnrun)
+ MCFG_PALETTE_LENGTH(32*3)
+ MCFG_PALETTE_INIT(pitnrun)
+ MCFG_VIDEO_START(pitnrun)
+ MCFG_VIDEO_UPDATE(pitnrun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 48fd9b8ff86..fffab4019e0 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -275,37 +275,37 @@ static MACHINE_RESET( pkscramble)
static MACHINE_CONFIG_START( pkscramble, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000 )
- MDRV_CPU_PROGRAM_MAP(pkscramble_map)
- //MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) /* only valid irq */
+ MCFG_CPU_ADD("maincpu", M68000, 8000000 )
+ MCFG_CPU_PROGRAM_MAP(pkscramble_map)
+ //MCFG_CPU_VBLANK_INT("screen", irq1_line_hold) /* only valid irq */
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_START(pkscramble)
- MDRV_MACHINE_RESET(pkscramble)
+ MCFG_MACHINE_START(pkscramble)
+ MCFG_MACHINE_RESET(pkscramble)
- MDRV_TIMER_ADD("scan_timer", scanline_callback)
+ MCFG_TIMER_ADD("scan_timer", scanline_callback)
/* 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, 0*8, 24*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, 32*8-1, 0*8, 24*8-1)
- MDRV_PALETTE_LENGTH(0x800)
- MDRV_GFXDECODE(pkscram)
+ MCFG_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(pkscram)
- MDRV_VIDEO_START(pkscramble)
- MDRV_VIDEO_UPDATE(pkscramble)
+ MCFG_VIDEO_START(pkscramble)
+ MCFG_VIDEO_UPDATE(pkscramble)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 12000000/4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 12000000/4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index d1d2d7758f9..f42c3e87005 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -321,72 +321,72 @@ static MACHINE_START( pktgaldx )
static MACHINE_CONFIG_START( pktgaldx, pktgaldx_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(pktgaldx_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(pktgaldx_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(pktgaldx)
+ MCFG_MACHINE_START(pktgaldx)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_GFXDECODE(pktgaldx)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(pktgaldx)
- MDRV_VIDEO_UPDATE(pktgaldx)
+ MCFG_VIDEO_UPDATE(pktgaldx)
- MDRV_DECO16IC_ADD("deco_custom", pktgaldx_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", pktgaldx_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pktgaldb, pktgaldx_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(pktgaldb_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(pktgaldb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(pktgaldx)
+ MCFG_MACHINE_START(pktgaldx)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_GFXDECODE(bootleg)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(bootleg)
- MDRV_VIDEO_UPDATE(pktgaldb)
+ MCFG_VIDEO_UPDATE(pktgaldb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index 113409108b4..e5b844ee56b 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -675,62 +675,62 @@ static const nes_interface nes_config =
static MACHINE_CONFIG_START( playch10, playch10_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", Z80, 8000000/2) // 4 MHz
- MDRV_CPU_PROGRAM_MAP(bios_map)
- MDRV_CPU_IO_MAP(bios_io_map)
- MDRV_CPU_VBLANK_INT("top", playch10_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000/2) // 4 MHz
+ MCFG_CPU_PROGRAM_MAP(bios_map)
+ MCFG_CPU_IO_MAP(bios_io_map)
+ MCFG_CPU_VBLANK_INT("top", playch10_interrupt)
- MDRV_CPU_ADD("cart", N2A03, N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(cart_map)
+ MCFG_CPU_ADD("cart", N2A03, N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(cart_map)
- MDRV_MACHINE_RESET(pc10)
- MDRV_MACHINE_START(pc10)
+ MCFG_MACHINE_RESET(pc10)
+ MCFG_MACHINE_START(pc10)
// video hardware
- MDRV_GFXDECODE(playch10)
- MDRV_PALETTE_LENGTH(256+8*4*16)
- MDRV_DEFAULT_LAYOUT(layout_dualhuov)
+ MCFG_GFXDECODE(playch10)
+ MCFG_PALETTE_LENGTH(256+8*4*16)
+ MCFG_DEFAULT_LAYOUT(layout_dualhuov)
- MDRV_SCREEN_ADD("top", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(32*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("top", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(32*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_SCREEN_ADD("bottom", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(32*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("bottom", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(32*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_INIT(playch10)
- MDRV_VIDEO_START(playch10)
- MDRV_VIDEO_UPDATE(playch10)
+ MCFG_PALETTE_INIT(playch10)
+ MCFG_VIDEO_START(playch10)
+ MCFG_VIDEO_UPDATE(playch10)
- MDRV_PPU2C03B_ADD("ppu", playch10_ppu_interface)
+ MCFG_PPU2C03B_ADD("ppu", playch10_ppu_interface)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
- MDRV_SOUND_CONFIG(nes_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- 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_RP5H01_ADD("rp5h01")
+ MCFG_RP5H01_ADD("rp5h01")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( playchnv, playch10 )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( playch10_hboard, playch10 )
- MDRV_VIDEO_START(playch10_hboard)
- MDRV_MACHINE_START(playch10_hboard)
+ MCFG_VIDEO_START(playch10_hboard)
+ MCFG_MACHINE_START(playch10_hboard)
- MDRV_DEVICE_REMOVE("ppu")
- MDRV_PPU2C03B_ADD("ppu", playch10_ppu_interface)
+ MCFG_DEVICE_REMOVE("ppu")
+ MCFG_PPU2C03B_ADD("ppu", playch10_ppu_interface)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 123871395ae..2b67d9f05b4 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -949,183 +949,183 @@ static MACHINE_RESET( playmark )
static MACHINE_CONFIG_START( bigtwin, playmark_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(bigtwin_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(bigtwin_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(playmark_sound_io_map)
+ MCFG_CPU_IO_MAP(playmark_sound_io_map)
- MDRV_MACHINE_START(playmark)
- MDRV_MACHINE_RESET(playmark)
+ MCFG_MACHINE_START(playmark)
+ MCFG_MACHINE_RESET(playmark)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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, 2*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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, 2*8, 32*8-1)
- MDRV_GFXDECODE(playmark)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(playmark)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(bigtwin)
- MDRV_VIDEO_UPDATE(bigtwin)
+ MCFG_VIDEO_START(bigtwin)
+ MCFG_VIDEO_UPDATE(bigtwin)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wbeachvl, playmark_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(wbeachvl_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(wbeachvl_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
-// MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
+// MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
/* Program and Data Maps are internal to the MCU */
-// MDRV_CPU_IO_MAP(playmark_sound_io_map)
+// MCFG_CPU_IO_MAP(playmark_sound_io_map)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_EEPROM_DEFAULT_VALUE(0)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_DEFAULT_VALUE(0)
- MDRV_MACHINE_START(playmark)
- MDRV_MACHINE_RESET(playmark)
+ MCFG_MACHINE_START(playmark)
+ MCFG_MACHINE_RESET(playmark)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(wbeachvl)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(wbeachvl)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(wbeachvl)
- MDRV_VIDEO_UPDATE(wbeachvl)
+ MCFG_VIDEO_START(wbeachvl)
+ MCFG_VIDEO_UPDATE(wbeachvl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( excelsr, playmark_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(excelsr_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(excelsr_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000) /* 3MHz */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(playmark_sound_io_map)
+ MCFG_CPU_IO_MAP(playmark_sound_io_map)
- MDRV_MACHINE_START(playmark)
- MDRV_MACHINE_RESET(playmark)
+ MCFG_MACHINE_START(playmark)
+ MCFG_MACHINE_RESET(playmark)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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, 2*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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, 2*8, 32*8-1)
- MDRV_GFXDECODE(excelsr)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(excelsr)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(excelsr)
- MDRV_VIDEO_UPDATE(excelsr)
+ MCFG_VIDEO_START(excelsr)
+ MCFG_VIDEO_UPDATE(excelsr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hotmind, playmark_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(hotmind_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(hotmind_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
/* Program and Data Maps are internal to the MCU */
- MDRV_CPU_IO_MAP(playmark_sound_io_map)
+ MCFG_CPU_IO_MAP(playmark_sound_io_map)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_EEPROM_DEFAULT_VALUE(0)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_DEFAULT_VALUE(0)
- MDRV_MACHINE_START(playmark)
- MDRV_MACHINE_RESET(playmark)
+ MCFG_MACHINE_START(playmark)
+ MCFG_MACHINE_RESET(playmark)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(hrdtimes)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(hrdtimes)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(hotmind)
- MDRV_VIDEO_UPDATE(hrdtimes)
+ MCFG_VIDEO_START(hotmind)
+ MCFG_VIDEO_UPDATE(hrdtimes)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hrdtimes, playmark_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(hrdtimes_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(hrdtimes_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
-// MDRV_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
+// MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL_24MHz/2) /* verified on pcb */
/* Program and Data Maps are internal to the MCU */
-// MDRV_CPU_IO_MAP(playmark_sound_io_map)
+// MCFG_CPU_IO_MAP(playmark_sound_io_map)
- MDRV_MACHINE_START(playmark)
- MDRV_MACHINE_RESET(playmark)
+ MCFG_MACHINE_START(playmark)
+ MCFG_MACHINE_RESET(playmark)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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, 2*8, 30*8-1)
- MDRV_GFXDECODE(hrdtimes)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(hrdtimes)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(hrdtimes)
- MDRV_VIDEO_UPDATE(hrdtimes)
+ MCFG_VIDEO_START(hrdtimes)
+ MCFG_VIDEO_UPDATE(hrdtimes)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 468af437ddb..2ea0a9281ca 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -638,54 +638,54 @@ static const k053936_interface polygonet_k053936_intf =
static MACHINE_CONFIG_START( plygonet, polygonet_state )
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz (xtal is 32.0 MHz) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", polygonet_interrupt)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz (xtal is 32.0 MHz) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", polygonet_interrupt)
- MDRV_CPU_ADD("dsp", DSP56156, 40000000) /* xtal is 40.0 MHz, DSP has an internal divide-by-2 */
- MDRV_CPU_PROGRAM_MAP(dsp_program_map)
- MDRV_CPU_DATA_MAP(dsp_data_map)
+ MCFG_CPU_ADD("dsp", DSP56156, 40000000) /* xtal is 40.0 MHz, DSP has an internal divide-by-2 */
+ MCFG_CPU_PROGRAM_MAP(dsp_program_map)
+ MCFG_CPU_DATA_MAP(dsp_data_map)
- MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(audio_interrupt, 480)
+ MCFG_CPU_ADD("soundcpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(audio_interrupt, 480)
- MDRV_MACHINE_START(polygonet)
+ MCFG_MACHINE_START(polygonet)
- MDRV_GFXDECODE(plygonet)
+ MCFG_GFXDECODE(plygonet)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* TODO: TEMPORARY! UNTIL A MORE LOCALIZED SYNC CAN BE MADE */
- MDRV_QUANTUM_TIME(HZ(1200000))
+ MCFG_QUANTUM_TIME(HZ(1200000))
/* 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(64, 64+368-1, 0, 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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(64, 64+368-1, 0, 32*8-1)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_VIDEO_START(polygonet)
- MDRV_VIDEO_UPDATE(polygonet)
+ MCFG_VIDEO_START(polygonet)
+ MCFG_VIDEO_UPDATE(polygonet)
- MDRV_K053936_ADD("k053936", polygonet_k053936_intf)
+ MCFG_K053936_ADD("k053936", polygonet_k053936_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami1", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("konami1", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("konami2", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("konami2", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index c4c8071369c..d965276cb16 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -437,24 +437,24 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( pntnpuzl, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)//??
- MDRV_CPU_PROGRAM_MAP(pntnpuzl_map)
- MDRV_CPU_VBLANK_INT("screen", pntnpuzl_irq) // irq1 = coin irq2 = service irq4 = coin
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)//??
+ MCFG_CPU_PROGRAM_MAP(pntnpuzl_map)
+ MCFG_CPU_VBLANK_INT("screen", pntnpuzl_irq) // irq1 = coin irq2 = service irq4 = coin
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
- 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 30*8-1)
+ 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, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(pntnpuzl)
- MDRV_VIDEO_UPDATE(pntnpuzl)
+ MCFG_VIDEO_START(pntnpuzl)
+ MCFG_VIDEO_UPDATE(pntnpuzl)
MACHINE_CONFIG_END
ROM_START( pntnpuzl )
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index bf58261d748..6f4e8fbe241 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -225,40 +225,40 @@ GFXDECODE_END
static MACHINE_CONFIG_START( pokechmp, pokechmp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 4000000)
- MDRV_CPU_PROGRAM_MAP(pokechmp_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, 4000000)
+ MCFG_CPU_PROGRAM_MAP(pokechmp_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6502, 4000000)
- MDRV_CPU_PROGRAM_MAP(pokechmp_sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", M6502, 4000000)
+ MCFG_CPU_PROGRAM_MAP(pokechmp_sound_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(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_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)
- MDRV_GFXDECODE(pokechmp)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(pokechmp)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(pokechmp)
- MDRV_VIDEO_UPDATE(pokechmp)
+ MCFG_VIDEO_START(pokechmp)
+ MCFG_VIDEO_UPDATE(pokechmp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 4000000/4, OKIM6295_PIN7_HIGH) // ?? unknown frequency
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* sound fx */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 4000000/4, OKIM6295_PIN7_HIGH) // ?? unknown frequency
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* sound fx */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static DRIVER_INIT( pokechmp )
diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c
index 5b790046bc9..a3aab739714 100644
--- a/src/mame/drivers/poker72.c
+++ b/src/mame/drivers/poker72.c
@@ -333,32 +333,32 @@ static MACHINE_CONFIG_START( poker72, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(poker72_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(poker72_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(poker72)
+ MCFG_MACHINE_RESET(poker72)
/* 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, 64*8-1, 0, 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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 32*8-1)
- MDRV_GFXDECODE(poker72)
- MDRV_PALETTE_LENGTH(0xe00)
- MDRV_PALETTE_INIT(poker72)
+ MCFG_GFXDECODE(poker72)
+ MCFG_PALETTE_LENGTH(0xe00)
+ MCFG_PALETTE_INIT(poker72)
- MDRV_VIDEO_START(poker72)
- MDRV_VIDEO_UPDATE(poker72)
+ MCFG_VIDEO_START(poker72)
+ MCFG_VIDEO_UPDATE(poker72)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay", AY8910, 8000000/8) /* ? Mhz */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay", AY8910, 8000000/8) /* ? Mhz */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 1ce6d44bc07..cc32d5c94d0 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -867,70 +867,70 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( polepos, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z80_map)
- MDRV_CPU_IO_MAP(z80_io)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(z80_map)
+ MCFG_CPU_IO_MAP(z80_io)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */
- MDRV_CPU_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z8002_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(z8002_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub2", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z8002_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub2", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(z8002_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/8/2, namco_51xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_52XX_ADD("52xx", MASTER_CLOCK/8/2, namco_52xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_53XX_ADD("53xx", MASTER_CLOCK/8/2, namco_53xx_intf) /* 1.536 MHz */
- MDRV_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/8/2, "discrete", NODE_01) /* 1.536 MHz */
+ MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/8/2, namco_51xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_52XX_ADD("52xx", MASTER_CLOCK/8/2, namco_52xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_53XX_ADD("53xx", MASTER_CLOCK/8/2, namco_53xx_intf) /* 1.536 MHz */
+ MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/8/2, "discrete", NODE_01) /* 1.536 MHz */
- MDRV_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/8/64, "maincpu", "51xx", "53xx", "52xx", "54xx")
+ MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/8/64, "maincpu", "51xx", "53xx", "52xx", "54xx")
- MDRV_WATCHDOG_VBLANK_INIT(16) // 128V clocks the same as VBLANK
+ MCFG_WATCHDOG_VBLANK_INIT(16) // 128V clocks the same as VBLANK
- MDRV_QUANTUM_TIME(HZ(6000)) /* some interleaving */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* some interleaving */
- MDRV_MACHINE_RESET(polepos)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(polepos)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((double)MASTER_CLOCK/4/384/264)
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((double)MASTER_CLOCK/4/384/264)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
/* should be correct, but makes polepos2 and clones fail to boot */
-// MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 384, 0, 256, 264, 16, 224+16)
+// MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 384, 0, 256, 264, 16, 224+16)
- MDRV_GFXDECODE(polepos)
- MDRV_PALETTE_LENGTH(0x0f00)
- MDRV_DEFAULT_LAYOUT(layout_polepos)
+ MCFG_GFXDECODE(polepos)
+ MCFG_PALETTE_LENGTH(0x0f00)
+ MCFG_DEFAULT_LAYOUT(layout_polepos)
- MDRV_PALETTE_INIT(polepos)
- MDRV_VIDEO_START(polepos)
- MDRV_VIDEO_UPDATE(polepos)
+ MCFG_PALETTE_INIT(polepos)
+ MCFG_VIDEO_START(polepos)
+ MCFG_VIDEO_UPDATE(polepos)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/512)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/512)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
/* discrete circuit on the 54XX outputs */
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(polepos)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(polepos)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
/* engine sound */
- MDRV_SOUND_ADD("polepos", POLEPOS, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90 * 0.77)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77)
+ MCFG_SOUND_ADD("polepos", POLEPOS, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90 * 0.77)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77)
MACHINE_CONFIG_END
/* doesn't exist on the bootleg, but required for now or the game only boots in test mode!
@@ -953,58 +953,58 @@ static const namco_51xx_interface namco_51xx_bl_intf =
static MACHINE_CONFIG_START( topracern, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z80_map)
- MDRV_CPU_IO_MAP(z80_io)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(z80_map)
+ MCFG_CPU_IO_MAP(z80_io)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */
- MDRV_CPU_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z8002_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(z8002_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub2", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(z8002_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub2", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(z8002_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
/* todo, remove these devices too, this bootleg doesn't have them, but the emulation doesn't boot without them.. */
- MDRV_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/8/2, namco_51xx_bl_intf) /* 1.536 MHz */
- MDRV_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/8/64, "maincpu", "51xx", NULL, NULL, NULL)
+ MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/8/2, namco_51xx_bl_intf) /* 1.536 MHz */
+ MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/8/64, "maincpu", "51xx", NULL, NULL, NULL)
- MDRV_WATCHDOG_VBLANK_INIT(16) // 128V clocks the same as VBLANK
+ MCFG_WATCHDOG_VBLANK_INIT(16) // 128V clocks the same as VBLANK
- MDRV_QUANTUM_TIME(HZ(6000)) /* some interleaving */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* some interleaving */
- MDRV_MACHINE_RESET(polepos)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(polepos)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((double)MASTER_CLOCK/4/384/264)
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((double)MASTER_CLOCK/4/384/264)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(polepos)
- MDRV_PALETTE_LENGTH(0x0f00)
- MDRV_DEFAULT_LAYOUT(layout_topracer)
+ MCFG_GFXDECODE(polepos)
+ MCFG_PALETTE_LENGTH(0x0f00)
+ MCFG_DEFAULT_LAYOUT(layout_topracer)
- MDRV_PALETTE_INIT(polepos)
- MDRV_VIDEO_START(polepos)
- MDRV_VIDEO_UPDATE(polepos)
+ MCFG_PALETTE_INIT(polepos)
+ MCFG_VIDEO_START(polepos)
+ MCFG_VIDEO_UPDATE(polepos)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/512)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/512)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
/* engine sound */
- MDRV_SOUND_ADD("polepos", POLEPOS, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90 * 0.77)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77)
+ MCFG_SOUND_ADD("polepos", POLEPOS, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90 * 0.77)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77)
MACHINE_CONFIG_END
@@ -1019,13 +1019,13 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( polepos2bi, topracern )
- MDRV_CPU_ADD("soundz80bl", Z80, MASTER_CLOCK/8) /*? MHz */
- MDRV_CPU_PROGRAM_MAP(sound_z80_bootleg_map)
- MDRV_CPU_IO_MAP(sound_z80_bootleg_iomap)
+ MCFG_CPU_ADD("soundz80bl", Z80, MASTER_CLOCK/8) /*? MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_z80_bootleg_map)
+ MCFG_CPU_IO_MAP(sound_z80_bootleg_iomap)
- MDRV_SOUND_ADD("tms", TMS5220, 600000) /* ? Mhz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("tms", TMS5220, 600000) /* ? Mhz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 936450b6911..5dc4ad792f3 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -428,41 +428,41 @@ static const r3000_cpu_core r3000_config =
static MACHINE_CONFIG_START( policetr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R3000BE, MASTER_CLOCK/2)
- MDRV_CPU_CONFIG(r3000_config)
- MDRV_CPU_PROGRAM_MAP(policetr_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_gen)
+ MCFG_CPU_ADD("maincpu", R3000BE, MASTER_CLOCK/2)
+ MCFG_CPU_CONFIG(r3000_config)
+ MCFG_CPU_PROGRAM_MAP(policetr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_gen)
- MDRV_EEPROM_ADD("eeprom", eeprom_interface_policetr)
+ MCFG_EEPROM_ADD("eeprom", eeprom_interface_policetr)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(400, 262) /* needs to be verified */
- MDRV_SCREEN_VISIBLE_AREA(0, 393, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(400, 262) /* needs to be verified */
+ MCFG_SCREEN_VISIBLE_AREA(0, 393, 0, 239)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(policetr)
- MDRV_VIDEO_UPDATE(policetr)
+ MCFG_VIDEO_START(policetr)
+ MCFG_VIDEO_UPDATE(policetr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("bsmt", BSMT2000, MASTER_CLOCK/2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("bsmt", BSMT2000, MASTER_CLOCK/2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sshooter, policetr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sshooter_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sshooter_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 5031104b512..cb993435517 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -279,37 +279,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( polyplay, polyplay_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 9830400/4)
- MDRV_CPU_PROGRAM_MAP(polyplay_map)
- MDRV_CPU_IO_MAP(polyplay_io_map)
- MDRV_CPU_PERIODIC_INT(periodic_interrupt,75)
- MDRV_CPU_VBLANK_INT("screen", coin_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 9830400/4)
+ MCFG_CPU_PROGRAM_MAP(polyplay_map)
+ MCFG_CPU_IO_MAP(polyplay_io_map)
+ MCFG_CPU_PERIODIC_INT(periodic_interrupt,75)
+ MCFG_CPU_VBLANK_INT("screen", coin_interrupt)
- MDRV_MACHINE_RESET(polyplay)
+ MCFG_MACHINE_RESET(polyplay)
- MDRV_TIMER_ADD("timer", polyplay_timer_callback)
+ MCFG_TIMER_ADD("timer", polyplay_timer_callback)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(polyplay)
- MDRV_PALETTE_LENGTH(10)
+ MCFG_GFXDECODE(polyplay)
+ MCFG_PALETTE_LENGTH(10)
- MDRV_PALETTE_INIT(polyplay)
- MDRV_VIDEO_START(polyplay)
- MDRV_VIDEO_UPDATE(polyplay)
+ MCFG_PALETTE_INIT(polyplay)
+ MCFG_VIDEO_START(polyplay)
+ MCFG_VIDEO_UPDATE(polyplay)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(polyplay_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(polyplay_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/poo.c b/src/mame/drivers/poo.c
index dcf684fdd3e..412f5e1f470 100644
--- a/src/mame/drivers/poo.c
+++ b/src/mame/drivers/poo.c
@@ -312,36 +312,36 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( unclepoo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,18000000/6) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(unclepoo_main_map)
- MDRV_CPU_IO_MAP(unclepoo_main_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,256) // ??? controls game speed
+ MCFG_CPU_ADD("maincpu", Z80,18000000/6) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(unclepoo_main_map)
+ MCFG_CPU_IO_MAP(unclepoo_main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,256) // ??? controls game speed
- MDRV_CPU_ADD("subcpu", Z80,18000000/12) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(unclepoo_sub_map)
- MDRV_CPU_IO_MAP(unclepoo_sub_portmap)
-// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("subcpu", Z80,18000000/12) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(unclepoo_sub_map)
+ MCFG_CPU_IO_MAP(unclepoo_sub_portmap)
+// 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1)
-
- MDRV_GFXDECODE(unclepoo)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(unclepoo)
-
- MDRV_VIDEO_START(unclepoo)
- MDRV_VIDEO_UPDATE(unclepoo)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay", AY8910, 18000000/12) /* ? Mhz */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1)
+
+ MCFG_GFXDECODE(unclepoo)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(unclepoo)
+
+ MCFG_VIDEO_START(unclepoo)
+ MCFG_VIDEO_UPDATE(unclepoo)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay", AY8910, 18000000/12) /* ? Mhz */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index 81687be1502..ee0b0ef4d13 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -215,29 +215,29 @@ static PALETTE_INIT( poolshrk )
static MACHINE_CONFIG_START( poolshrk, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, 11055000 / 8) /* ? */
- MDRV_CPU_PROGRAM_MAP(poolshrk_cpu_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", M6800, 11055000 / 8) /* ? */
+ MCFG_CPU_PROGRAM_MAP(poolshrk_cpu_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(1, 255, 24, 255)
-
- MDRV_GFXDECODE(poolshrk)
- MDRV_PALETTE_LENGTH(4)
- MDRV_PALETTE_INIT(poolshrk)
- MDRV_VIDEO_START(poolshrk)
- MDRV_VIDEO_UPDATE(poolshrk)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(1, 255, 24, 255)
+
+ MCFG_GFXDECODE(poolshrk)
+ MCFG_PALETTE_LENGTH(4)
+ MCFG_PALETTE_INIT(poolshrk)
+ MCFG_VIDEO_START(poolshrk)
+ MCFG_VIDEO_UPDATE(poolshrk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(poolshrk)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(poolshrk)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index 37b0872398b..17846124293 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -226,29 +226,29 @@ static MACHINE_RESET( pooyan )
static MACHINE_CONFIG_START( pooyan, pooyan_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", pooyan_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", pooyan_interrupt)
- MDRV_MACHINE_START(pooyan)
- MDRV_MACHINE_RESET(pooyan)
+ MCFG_MACHINE_START(pooyan)
+ MCFG_MACHINE_RESET(pooyan)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ 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)
- MDRV_GFXDECODE(pooyan)
- MDRV_PALETTE_LENGTH(16*16+16*16)
+ MCFG_GFXDECODE(pooyan)
+ MCFG_PALETTE_LENGTH(16*16+16*16)
- MDRV_PALETTE_INIT(pooyan)
- MDRV_VIDEO_START(pooyan)
- MDRV_VIDEO_UPDATE(pooyan)
+ MCFG_PALETTE_INIT(pooyan)
+ MCFG_VIDEO_START(pooyan)
+ MCFG_VIDEO_UPDATE(pooyan)
/* sound hardware */
- MDRV_FRAGMENT_ADD(timeplt_sound)
+ MCFG_FRAGMENT_ADD(timeplt_sound)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 28642c7140e..cca072de2ab 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -427,49 +427,49 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( skyskipr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(skyskipr_map)
- MDRV_CPU_IO_MAP(popeye_io_map)
- MDRV_CPU_VBLANK_INT("screen", popeye_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(skyskipr_map)
+ MCFG_CPU_IO_MAP(popeye_io_map)
+ MCFG_CPU_VBLANK_INT("screen", popeye_interrupt)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 2*16, 30*16-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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 2*16, 30*16-1)
- MDRV_GFXDECODE(popeye)
- MDRV_PALETTE_LENGTH(16+16*2+64*4)
+ MCFG_GFXDECODE(popeye)
+ MCFG_PALETTE_LENGTH(16+16*2+64*4)
- MDRV_PALETTE_INIT(popeye)
- MDRV_VIDEO_START(skyskipr)
- MDRV_VIDEO_UPDATE(popeye)
+ MCFG_PALETTE_INIT(popeye)
+ MCFG_VIDEO_START(skyskipr)
+ MCFG_VIDEO_UPDATE(popeye)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_8MHz/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_8MHz/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( popeye, skyskipr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(popeye_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(popeye_map)
- MDRV_VIDEO_START(popeye)
+ MCFG_VIDEO_START(popeye)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( popeyebl, skyskipr )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(popeyebl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(popeyebl_map)
- MDRV_PALETTE_INIT(popeyebl)
- MDRV_VIDEO_START(popeye)
+ MCFG_PALETTE_INIT(popeyebl)
+ MCFG_VIDEO_START(popeye)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 6c6febf53d8..f56202190d9 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -328,42 +328,42 @@ static MACHINE_RESET( popper )
static MACHINE_CONFIG_START( popper, popper_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,18432000/6)
- MDRV_CPU_PROGRAM_MAP(popper_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,18432000/6)
+ MCFG_CPU_PROGRAM_MAP(popper_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80,18432000/12)
- MDRV_CPU_PROGRAM_MAP(popper_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) //NMIs caused by the main CPU
+ MCFG_CPU_ADD("audiocpu", Z80,18432000/12)
+ MCFG_CPU_PROGRAM_MAP(popper_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) //NMIs caused by the main CPU
- MDRV_QUANTUM_TIME(HZ(1800))
+ MCFG_QUANTUM_TIME(HZ(1800))
- MDRV_MACHINE_START(popper)
- MDRV_MACHINE_RESET(popper)
+ MCFG_MACHINE_START(popper)
+ MCFG_MACHINE_RESET(popper)
/* 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(33*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 33*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(33*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 33*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(popper)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(popper)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(popper)
- MDRV_VIDEO_START(popper)
- MDRV_VIDEO_UPDATE(popper)
+ MCFG_PALETTE_INIT(popper)
+ MCFG_VIDEO_START(popper)
+ MCFG_VIDEO_UPDATE(popper)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 18432000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 18432000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 18432000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 18432000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index 338b30fbf79..bd46f9e1544 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -241,35 +241,35 @@ static GFXDECODE_START( portrait )
GFXDECODE_END
static MACHINE_CONFIG_START( portrait, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(portrait_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(portrait_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", I8039, 3120000) /* ? */
- MDRV_CPU_PROGRAM_MAP(portrait_sound_map)
+ MCFG_CPU_ADD("audiocpu", I8039, 3120000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(portrait_sound_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- 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, 54*8-1, 0*8, 40*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ 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, 54*8-1, 0*8, 40*8-1)
- MDRV_GFXDECODE(portrait)
- MDRV_PALETTE_LENGTH(0x800)
- MDRV_PALETTE_INIT(portrait)
+ MCFG_GFXDECODE(portrait)
+ MCFG_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_INIT(portrait)
- MDRV_VIDEO_START(portrait)
- MDRV_VIDEO_UPDATE(portrait)
+ MCFG_VIDEO_START(portrait)
+ MCFG_VIDEO_UPDATE(portrait)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("tms", TMS5200, 640000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5200, 640000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 495c3d7896a..b37f4e57689 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -486,66 +486,66 @@ static MACHINE_RESET( powerbal )
static MACHINE_CONFIG_START( powerbal, playmark_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(powerbal_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(powerbal_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_MACHINE_START(powerbal)
- MDRV_MACHINE_RESET(powerbal)
+ MCFG_MACHINE_START(powerbal)
+ MCFG_MACHINE_RESET(powerbal)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(61)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(128*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(61)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(128*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(powerbal)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(powerbal)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(powerbal)
- MDRV_VIDEO_UPDATE(powerbal)
+ MCFG_VIDEO_START(powerbal)
+ MCFG_VIDEO_UPDATE(powerbal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( magicstk, playmark_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(magicstk_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(magicstk_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_EEPROM_DEFAULT_VALUE(0)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_DEFAULT_VALUE(0)
- MDRV_MACHINE_START(powerbal)
- MDRV_MACHINE_RESET(powerbal)
+ MCFG_MACHINE_START(powerbal)
+ MCFG_MACHINE_RESET(powerbal)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(61)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(128*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(61)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(128*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(powerbal)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(powerbal)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(powerbal)
- MDRV_VIDEO_UPDATE(powerbal)
+ MCFG_VIDEO_START(powerbal)
+ MCFG_VIDEO_UPDATE(powerbal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index f5a407221d2..3aa8d036afc 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -342,77 +342,77 @@ static const nmk112_interface powerins_nmk112_intf =
static MACHINE_CONFIG_START( powerins, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12MHz */
- MDRV_CPU_PROGRAM_MAP(powerins_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12MHz */
+ MCFG_CPU_PROGRAM_MAP(powerins_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, 6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(powerins_sound_map)
- MDRV_CPU_IO_MAP(powerins_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 6000000) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(powerins_sound_map)
+ MCFG_CPU_IO_MAP(powerins_sound_io_map)
- MDRV_MACHINE_RESET(powerins)
+ MCFG_MACHINE_RESET(powerins)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0+16, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(powerins)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(powerins)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(powerins)
- MDRV_VIDEO_UPDATE(powerins)
+ MCFG_VIDEO_START(powerins)
+ MCFG_VIDEO_UPDATE(powerins)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 4000000, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_OKIM6295_ADD("oki1", 4000000, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_OKIM6295_ADD("oki2", 4000000, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_OKIM6295_ADD("oki2", 4000000, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ym2203", YM2203, 12000000 / 8)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ym2203", YM2203, 12000000 / 8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MDRV_NMK112_ADD("nmk112", powerins_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", powerins_nmk112_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( powerina, powerins )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(powerina_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(powerina_map)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
- MDRV_DEVICE_REMOVE("soundcpu")
+ MCFG_DEVICE_REMOVE("soundcpu")
- MDRV_OKIM6295_REPLACE("oki1", 990000, OKIM6295_PIN7_LOW) // pin7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_REPLACE("oki1", 990000, OKIM6295_PIN7_LOW) // pin7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_DEVICE_REMOVE("oki2")
- MDRV_DEVICE_REMOVE("ym2203")
+ MCFG_DEVICE_REMOVE("oki2")
+ MCFG_DEVICE_REMOVE("ym2203")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( powerinb, powerins )
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
- MDRV_CPU_MODIFY("soundcpu") /* 6 MHz */
- MDRV_CPU_IO_MAP(powerinb_sound_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 120) // YM2203 rate is at 150??
+ MCFG_CPU_MODIFY("soundcpu") /* 6 MHz */
+ MCFG_CPU_IO_MAP(powerinb_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 120) // YM2203 rate is at 150??
- MDRV_DEVICE_REMOVE("ym2203") // Sound code talks to one, but it's not fitted on the board
+ MCFG_DEVICE_REMOVE("ym2203") // Sound code talks to one, but it's not fitted on the board
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 8aa725fbf46..e2bf7e7fe44 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -341,39 +341,39 @@ static VIDEO_UPDATE( ppmast93 )
static MACHINE_CONFIG_START( ppmast93, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(ppmast93_cpu1_map)
- MDRV_CPU_IO_MAP(ppmast93_cpu1_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,5000000) /* 5 MHz */
+ MCFG_CPU_PROGRAM_MAP(ppmast93_cpu1_map)
+ MCFG_CPU_IO_MAP(ppmast93_cpu1_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(ppmast93_cpu2_map)
- MDRV_CPU_IO_MAP(ppmast93_cpu2_io)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
+ MCFG_CPU_ADD("sub", Z80,5000000) /* 5 MHz */
+ MCFG_CPU_PROGRAM_MAP(ppmast93_cpu2_map)
+ MCFG_CPU_IO_MAP(ppmast93_cpu2_io)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,8000)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
- MDRV_GFXDECODE(ppmast93)
+ MCFG_GFXDECODE(ppmast93)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(ppmast93)
- MDRV_VIDEO_UPDATE(ppmast93)
+ MCFG_VIDEO_START(ppmast93)
+ MCFG_VIDEO_UPDATE(ppmast93)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 5000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ymsnd", YM2413, 5000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index f73963ecb95..fdb6dee191f 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -206,37 +206,37 @@ static const ym3812_interface ym3812_config =
static MACHINE_CONFIG_START( prehisle, prehisle_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(prehisle_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(prehisle_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(prehisle_sound_map)
- MDRV_CPU_IO_MAP(prehisle_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_4MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(prehisle_sound_map)
+ MCFG_CPU_IO_MAP(prehisle_sound_io_map)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(prehisle)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(prehisle)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(prehisle)
- MDRV_VIDEO_UPDATE(prehisle)
+ MCFG_VIDEO_START(prehisle)
+ MCFG_VIDEO_UPDATE(prehisle)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 36e138c1004..89f109e1c52 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -445,39 +445,39 @@ static PALETTE_INIT( progolf )
static MACHINE_CONFIG_START( progolf, progolf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */
- MDRV_CPU_PROGRAM_MAP(main_cpu)
- MDRV_CPU_VBLANK_INT("screen", progolf_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */
+ MCFG_CPU_PROGRAM_MAP(main_cpu)
+ MCFG_CPU_VBLANK_INT("screen", progolf_interrupt)
- MDRV_CPU_ADD("audiocpu", M6502, 500000)
- MDRV_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_CPU_ADD("audiocpu", M6502, 500000)
+ MCFG_CPU_PROGRAM_MAP(sound_cpu)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3072))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3072))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(progolf)
- MDRV_PALETTE_LENGTH(32*3)
- MDRV_PALETTE_INIT(progolf)
+ MCFG_GFXDECODE(progolf)
+ MCFG_PALETTE_LENGTH(32*3)
+ MCFG_PALETTE_INIT(progolf)
- MDRV_MC6845_ADD("crtc", MC6845, 3000000/4, mc6845_intf) /* hand tuned to get ~57 fps */
- MDRV_VIDEO_START(progolf)
- MDRV_VIDEO_UPDATE(progolf)
+ MCFG_MC6845_ADD("crtc", MC6845, 3000000/4, mc6845_intf) /* hand tuned to get ~57 fps */
+ MCFG_VIDEO_START(progolf)
+ MCFG_VIDEO_UPDATE(progolf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 12000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_ADD("ay1", AY8910, 12000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_ADD("ay2", AY8910, 12000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_ADD("ay2", AY8910, 12000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c
index 0a26e13c9bd..c7f7c358e77 100644
--- a/src/mame/drivers/psattack.c
+++ b/src/mame/drivers/psattack.c
@@ -159,35 +159,35 @@ static const vr0_interface vr0_config =
static MACHINE_CONFIG_START( psattack, driver_device )
- MDRV_CPU_ADD("maincpu", SE3208, 43000000)
- MDRV_CPU_PROGRAM_MAP(psattack_mem)
- MDRV_CPU_VBLANK_INT("screen", psattack_interrupt)
+ MCFG_CPU_ADD("maincpu", SE3208, 43000000)
+ MCFG_CPU_PROGRAM_MAP(psattack_mem)
+ MCFG_CPU_VBLANK_INT("screen", psattack_interrupt)
- MDRV_MACHINE_START(psattack)
- MDRV_MACHINE_RESET(psattack)
+ MCFG_MACHINE_START(psattack)
+ MCFG_MACHINE_RESET(psattack)
- //MDRV_NVRAM_ADD_0FILL("nvram")
+ //MCFG_NVRAM_ADD_0FILL("nvram")
- 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_VIDEO_START(psattack)
- MDRV_VIDEO_UPDATE(psattack)
- MDRV_VIDEO_EOF(psattack)
+ MCFG_VIDEO_START(psattack)
+ MCFG_VIDEO_UPDATE(psattack)
+ MCFG_VIDEO_EOF(psattack)
- MDRV_PALETTE_INIT(RRRRR_GGGGGG_BBBBB)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_INIT(RRRRR_GGGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("vrender", VRENDER0, 0)
- MDRV_SOUND_CONFIG(vr0_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("vrender", VRENDER0, 0)
+ MCFG_SOUND_CONFIG(vr0_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index c908062bdb1..9ff00e2dbcf 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -1063,41 +1063,41 @@ static const ym2610_interface sngkace_ym2610_interface =
static MACHINE_CONFIG_START( sngkace, psikyo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(psikyo_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(psikyo_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sngkace_sound_map)
- MDRV_CPU_IO_MAP(sngkace_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sngkace_sound_map)
+ MCFG_CPU_IO_MAP(sngkace_sound_io_map)
- MDRV_MACHINE_START(psikyo)
- MDRV_MACHINE_RESET(psikyo)
+ MCFG_MACHINE_START(psikyo)
+ MCFG_MACHINE_RESET(psikyo)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.3)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.3)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
- MDRV_GFXDECODE(psikyo)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(psikyo)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(sngkace)
- MDRV_VIDEO_EOF(psikyo)
- MDRV_VIDEO_UPDATE(psikyo)
+ MCFG_VIDEO_START(sngkace)
+ MCFG_VIDEO_EOF(psikyo)
+ MCFG_VIDEO_UPDATE(psikyo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_32MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(sngkace_ym2610_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.2)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.2)
- 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, XTAL_32MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(sngkace_ym2610_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.2)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.2)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1115,74 +1115,74 @@ static const ym2610_interface gunbird_ym2610_interface =
static MACHINE_CONFIG_START( gunbird, psikyo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(psikyo_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
+ MCFG_CPU_PROGRAM_MAP(psikyo_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
- MDRV_CPU_PROGRAM_MAP(gunbird_sound_map)
- MDRV_CPU_IO_MAP(gunbird_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
+ MCFG_CPU_PROGRAM_MAP(gunbird_sound_map)
+ MCFG_CPU_IO_MAP(gunbird_sound_io_map)
- MDRV_MACHINE_START(psikyo)
- MDRV_MACHINE_RESET(psikyo)
+ MCFG_MACHINE_START(psikyo)
+ MCFG_MACHINE_RESET(psikyo)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.3)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.3)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
- MDRV_GFXDECODE(psikyo)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(psikyo)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(psikyo)
- MDRV_VIDEO_EOF(psikyo)
- MDRV_VIDEO_UPDATE(psikyo)
+ MCFG_VIDEO_START(psikyo)
+ MCFG_VIDEO_EOF(psikyo)
+ MCFG_VIDEO_UPDATE(psikyo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(gunbird_ym2610_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.2)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.2)
- 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(gunbird_ym2610_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.2)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.2)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( s1945bl, psikyo_state ) /* Bootleg hardware based on the unprotected Japanese Strikers 1945 set */
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(psikyo_bootleg_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
+ MCFG_CPU_PROGRAM_MAP(psikyo_bootleg_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_MACHINE_START(psikyo)
- MDRV_MACHINE_RESET(psikyo)
+ MCFG_MACHINE_START(psikyo)
+ MCFG_MACHINE_RESET(psikyo)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.3)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.3)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
- MDRV_GFXDECODE(psikyo)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(psikyo)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(psikyo)
- MDRV_VIDEO_UPDATE(psikyo_bootleg)
- MDRV_VIDEO_EOF(psikyo)
+ MCFG_VIDEO_START(psikyo)
+ MCFG_VIDEO_UPDATE(psikyo_bootleg)
+ MCFG_VIDEO_EOF(psikyo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_LOW) // ?? clock
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_DEVICE_ADDRESS_MAP(0, s1945bl_oki_map)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_LOW) // ?? clock
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_DEVICE_ADDRESS_MAP(0, s1945bl_oki_map)
MACHINE_CONFIG_END
@@ -1206,41 +1206,41 @@ static const ymf278b_interface ymf278b_config =
static MACHINE_CONFIG_START( s1945, psikyo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(psikyo_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
+ MCFG_CPU_PROGRAM_MAP(psikyo_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
- MDRV_CPU_PROGRAM_MAP(gunbird_sound_map)
- MDRV_CPU_IO_MAP(s1945_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
+ MCFG_CPU_PROGRAM_MAP(gunbird_sound_map)
+ MCFG_CPU_IO_MAP(s1945_sound_io_map)
/* MCU should go here */
- MDRV_MACHINE_START(psikyo)
- MDRV_MACHINE_RESET(psikyo)
+ MCFG_MACHINE_START(psikyo)
+ MCFG_MACHINE_RESET(psikyo)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.90) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.90) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
- MDRV_GFXDECODE(psikyo)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_GFXDECODE(psikyo)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(psikyo)
- MDRV_VIDEO_EOF(psikyo)
- MDRV_VIDEO_UPDATE(psikyo)
+ MCFG_VIDEO_START(psikyo)
+ MCFG_VIDEO_EOF(psikyo)
+ MCFG_VIDEO_UPDATE(psikyo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 85ae8d55dc3..ce7efa3449e 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -726,56 +726,56 @@ static MACHINE_RESET( psikyo4 )
static MACHINE_CONFIG_START( ps4big, psikyo4_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(ps4_map)
- MDRV_CPU_VBLANK_INT("lscreen", psikyosh_interrupt)
+ MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(ps4_map)
+ MCFG_CPU_VBLANK_INT("lscreen", psikyosh_interrupt)
- MDRV_MACHINE_START(psikyo4)
- MDRV_MACHINE_RESET(psikyo4)
+ MCFG_MACHINE_START(psikyo4)
+ MCFG_MACHINE_RESET(psikyo4)
- MDRV_EEPROM_ADD("eeprom", eeprom_interface_93C56)
- MDRV_EEPROM_DEFAULT_VALUE(0)
+ MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C56)
+ MCFG_EEPROM_DEFAULT_VALUE(0)
/* video hardware */
- MDRV_GFXDECODE(ps4)
- MDRV_PALETTE_LENGTH((0x2000/4)*2 + 2) /* 0x2000/4 for each screen. 1 for each screen clear colour */
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
-
- MDRV_VIDEO_START(psikyo4)
- MDRV_VIDEO_UPDATE(psikyo4)
+ MCFG_GFXDECODE(ps4)
+ MCFG_PALETTE_LENGTH((0x2000/4)*2 + 2) /* 0x2000/4 for each screen. 1 for each screen clear colour */
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+
+ MCFG_VIDEO_START(psikyo4)
+ MCFG_VIDEO_UPDATE(psikyo4)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ps4small, ps4big )
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("lscreen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("lscreen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_SCREEN_MODIFY("rscreen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("rscreen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 739b21f7f3f..5eb8f2112fa 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -814,59 +814,59 @@ static MACHINE_START( psikyosh )
static MACHINE_CONFIG_START( psikyo3v1, psikyosh_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(ps3v1_map)
- MDRV_CPU_VBLANK_INT("screen", psikyosh_interrupt)
+ MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(ps3v1_map)
+ MCFG_CPU_VBLANK_INT("screen", psikyosh_interrupt)
- MDRV_MACHINE_START(psikyosh)
+ MCFG_MACHINE_START(psikyosh)
- MDRV_EEPROM_ADD("eeprom", eeprom_interface_93C56)
- MDRV_EEPROM_DEFAULT_VALUE(0)
+ MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C56)
+ MCFG_EEPROM_DEFAULT_VALUE(0)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM ) /* If using alpha */
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM ) /* If using alpha */
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 28*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_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 28*8-1)
- MDRV_GFXDECODE(psikyosh)
- MDRV_PALETTE_LENGTH(0x5000/4)
+ MCFG_GFXDECODE(psikyosh)
+ MCFG_PALETTE_LENGTH(0x5000/4)
- MDRV_VIDEO_START(psikyosh)
- MDRV_VIDEO_EOF(psikyosh)
- MDRV_VIDEO_UPDATE(psikyosh)
+ MCFG_VIDEO_START(psikyosh)
+ MCFG_VIDEO_EOF(psikyosh)
+ MCFG_VIDEO_UPDATE(psikyosh)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
- MDRV_SOUND_CONFIG(ymf278b_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
+ MCFG_SOUND_CONFIG(ymf278b_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psikyo5, psikyo3v1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ps5_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ps5_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psikyo5_240, psikyo3v1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ps5_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ps5_map)
/* Ideally this would be driven off the video register. However, it doesn't changeat runtime and MAME will pick a better screen resolution if it knows upfront */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 30*8-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 24069c89fa9..7d815a1db67 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -659,94 +659,94 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( psychic5, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
- MDRV_CPU_PROGRAM_MAP(psychic5_main_map)
- MDRV_CPU_VBLANK_INT_HACK(psychic5_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
+ MCFG_CPU_PROGRAM_MAP(psychic5_main_map)
+ MCFG_CPU_VBLANK_INT_HACK(psychic5_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2)
- MDRV_CPU_PROGRAM_MAP(psychic5_sound_map)
- MDRV_CPU_IO_MAP(psychic5_soundport_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2)
+ MCFG_CPU_PROGRAM_MAP(psychic5_sound_map)
+ MCFG_CPU_IO_MAP(psychic5_soundport_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* Allow time for 2nd cpu to interleave */
- MDRV_MACHINE_RESET(psychic5)
+ MCFG_QUANTUM_TIME(HZ(600)) /* Allow time for 2nd cpu to interleave */
+ MCFG_MACHINE_RESET(psychic5)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(53.8)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(53.8)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
/* frames per second hand tuned to match game and music speed */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(psychic5)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(psychic5)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(psychic5)
- MDRV_VIDEO_RESET(psychic5)
- MDRV_VIDEO_UPDATE(psychic5)
+ MCFG_VIDEO_START(psychic5)
+ MCFG_VIDEO_RESET(psychic5)
+ MCFG_VIDEO_UPDATE(psychic5)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.50)
-
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8)
- 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.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
+
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bombsa, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2 ) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(bombsa_main_map)
- MDRV_CPU_VBLANK_INT_HACK(psychic5_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2 ) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(bombsa_main_map)
+ MCFG_CPU_VBLANK_INT_HACK(psychic5_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_5MHz )
- MDRV_CPU_PROGRAM_MAP(bombsa_sound_map)
- MDRV_CPU_IO_MAP(bombsa_soundport_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_5MHz )
+ MCFG_CPU_PROGRAM_MAP(bombsa_sound_map)
+ MCFG_CPU_IO_MAP(bombsa_soundport_map)
- MDRV_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(psychic5)
+ MCFG_QUANTUM_TIME(HZ(600))
+ MCFG_MACHINE_RESET(psychic5)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54) /* Guru says : VSync - 54Hz . HSync - 15.25kHz */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54) /* Guru says : VSync - 54Hz . HSync - 15.25kHz */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(bombsa)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(bombsa)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(bombsa)
- MDRV_VIDEO_RESET(bombsa)
- MDRV_VIDEO_UPDATE(bombsa)
+ MCFG_VIDEO_START(bombsa)
+ MCFG_VIDEO_RESET(bombsa)
+ MCFG_VIDEO_UPDATE(bombsa)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ROUTE(2, "mono", 0.30)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
-
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ROUTE(2, "mono", 0.30)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ROUTE(2, "mono", 0.30)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
+
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_12MHz/8)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ROUTE(2, "mono", 0.30)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index b7c895f3fb8..eee0a3cab15 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -460,39 +460,39 @@ static MACHINE_RESET( pturn )
}
static MACHINE_CONFIG_START( pturn, pturn_state )
- MDRV_CPU_ADD("maincpu", Z80, 12000000/3)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", pturn_main_intgen)
- MDRV_MACHINE_RESET(pturn)
+ MCFG_CPU_ADD("maincpu", Z80, 12000000/3)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", pturn_main_intgen)
+ MCFG_MACHINE_RESET(pturn)
- MDRV_CPU_ADD("audiocpu", Z80, 12000000/3)
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT_HACK(pturn_sub_intgen,3)
+ MCFG_CPU_ADD("audiocpu", Z80, 12000000/3)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT_HACK(pturn_sub_intgen,3)
- MDRV_GFXDECODE(pturn)
+ MCFG_GFXDECODE(pturn)
- 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)
+ 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)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(pturn)
- MDRV_VIDEO_UPDATE(pturn)
+ MCFG_VIDEO_START(pturn)
+ MCFG_VIDEO_UPDATE(pturn)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 75cb4b2b193..18eeb4f73f4 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -166,20 +166,20 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( puckpkmn, megadriv )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(puckpkmn_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(puckpkmn_map)
- MDRV_DEVICE_REMOVE("genesis_snd_z80")
+ MCFG_DEVICE_REMOVE("genesis_snd_z80")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( puckpkmna, puckpkmn )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(puckpkmna_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(puckpkmna_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index ccb991e6628..f992b3a24cf 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -926,49 +926,49 @@ static MACHINE_RESET( punchout )
static MACHINE_CONFIG_START( punchout, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(punchout_map)
- MDRV_CPU_IO_MAP(punchout_io_map)
- MDRV_CPU_VBLANK_INT("top", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(punchout_map)
+ MCFG_CPU_IO_MAP(punchout_io_map)
+ MCFG_CPU_VBLANK_INT("top", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", N2A03, N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(punchout_sound_map)
- MDRV_CPU_VBLANK_INT("top", nmi_line_pulse)
+ MCFG_CPU_ADD("audiocpu", N2A03, N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(punchout_sound_map)
+ MCFG_CPU_VBLANK_INT("top", nmi_line_pulse)
- MDRV_MACHINE_RESET(punchout)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(punchout)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_GFXDECODE(punchout)
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_DEFAULT_LAYOUT(layout_dualhovu)
-
- MDRV_SCREEN_ADD("top", 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)
-
- MDRV_SCREEN_ADD("bottom", 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)
-
- MDRV_VIDEO_START(punchout)
- MDRV_VIDEO_UPDATE(punchout)
+ MCFG_GFXDECODE(punchout)
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_DEFAULT_LAYOUT(layout_dualhovu)
+
+ MCFG_SCREEN_ADD("top", 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)
+
+ MCFG_SCREEN_ADD("bottom", 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)
+
+ MCFG_VIDEO_START(punchout)
+ MCFG_VIDEO_UPDATE(punchout)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
- MDRV_SOUND_CONFIG(nes_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("nes", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("vlm", VLM5030, 3580000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("vlm", VLM5030, 3580000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -976,14 +976,14 @@ static MACHINE_CONFIG_DERIVED( armwrest, punchout )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(armwrest_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(armwrest_map)
/* video hardware */
- MDRV_GFXDECODE(armwrest)
+ MCFG_GFXDECODE(armwrest)
- MDRV_VIDEO_START(armwrest)
- MDRV_VIDEO_UPDATE(armwrest)
+ MCFG_VIDEO_START(armwrest)
+ MCFG_VIDEO_UPDATE(armwrest)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 31eeb9af532..c8efe34bd4c 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -447,46 +447,46 @@ static MACHINE_RESET( pushman )
static MACHINE_CONFIG_START( pushman, pushman_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(pushman_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(pushman_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
/* ElSemi. Reversed the CPU order so the sound callback works with bballs */
- MDRV_CPU_ADD("mcu", M68705, 4000000) /* No idea */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", M68705, 4000000) /* No idea */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_QUANTUM_TIME(HZ(3600))
+ MCFG_QUANTUM_TIME(HZ(3600))
- MDRV_MACHINE_START(pushman)
- MDRV_MACHINE_RESET(pushman)
+ MCFG_MACHINE_START(pushman)
+ MCFG_MACHINE_RESET(pushman)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pushman)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(pushman)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(pushman)
- MDRV_VIDEO_UPDATE(pushman)
+ MCFG_VIDEO_START(pushman)
+ MCFG_VIDEO_UPDATE(pushman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 2000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, 2000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM2203, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym2", YM2203, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_RESET( bballs )
@@ -501,42 +501,42 @@ static MACHINE_RESET( bballs )
static MACHINE_CONFIG_START( bballs, pushman_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(bballs_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(bballs_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_QUANTUM_TIME(HZ(3600))
+ MCFG_QUANTUM_TIME(HZ(3600))
- MDRV_MACHINE_START(pushman)
- MDRV_MACHINE_RESET(bballs)
+ MCFG_MACHINE_START(pushman)
+ MCFG_MACHINE_RESET(bballs)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pushman)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(pushman)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(pushman)
- MDRV_VIDEO_UPDATE(pushman)
+ MCFG_VIDEO_START(pushman)
+ MCFG_VIDEO_UPDATE(pushman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 2000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, 2000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM2203, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym2", YM2203, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c
index ebe75426a13..c580aad9cdf 100644
--- a/src/mame/drivers/pzletime.c
+++ b/src/mame/drivers/pzletime.c
@@ -309,32 +309,32 @@ static MACHINE_RESET( pzletime )
static MACHINE_CONFIG_START( pzletime, pzletime_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,10000000)
- MDRV_CPU_PROGRAM_MAP(pzletime_map)
- MDRV_CPU_VBLANK_INT("screen",irq4_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,10000000)
+ MCFG_CPU_PROGRAM_MAP(pzletime_map)
+ MCFG_CPU_VBLANK_INT("screen",irq4_line_hold)
- MDRV_MACHINE_START(pzletime)
- MDRV_MACHINE_RESET(pzletime)
+ MCFG_MACHINE_START(pzletime)
+ MCFG_MACHINE_RESET(pzletime)
/* 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(0*8, 48*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(pzletime)
- MDRV_PALETTE_LENGTH(0x300 + 32768)
- MDRV_EEPROM_93C46_ADD("eeprom")
-
- MDRV_PALETTE_INIT(pzletime)
- MDRV_VIDEO_START(pzletime)
- MDRV_VIDEO_UPDATE(pzletime)
+ 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(0*8, 48*8-1, 0*8, 28*8-1)
+ MCFG_GFXDECODE(pzletime)
+ MCFG_PALETTE_LENGTH(0x300 + 32768)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+
+ MCFG_PALETTE_INIT(pzletime)
+ MCFG_VIDEO_START(pzletime)
+ MCFG_VIDEO_UPDATE(pzletime)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 937500, OKIM6295_PIN7_HIGH) //freq & pin7 taken from stlforce
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", 937500, OKIM6295_PIN7_HIGH) //freq & pin7 taken from stlforce
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 37a80436454..fdd44c76e46 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -640,76 +640,76 @@ static MACHINE_RESET( qdrmfgp )
static MACHINE_CONFIG_START( qdrmfgp, qdrmfgp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.000 MHz */
- MDRV_CPU_PROGRAM_MAP(qdrmfgp_map)
- MDRV_CPU_VBLANK_INT_HACK(qdrmfgp_interrupt, 2)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(qdrmfgp_map)
+ MCFG_CPU_VBLANK_INT_HACK(qdrmfgp_interrupt, 2)
- MDRV_MACHINE_START(qdrmfgp)
- MDRV_MACHINE_RESET(qdrmfgp)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(qdrmfgp)
+ MCFG_MACHINE_RESET(qdrmfgp)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
/* 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(40, 40+384-1, 16, 16+224-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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(qdrmfgp)
- MDRV_VIDEO_UPDATE(qdrmfgp)
+ MCFG_VIDEO_START(qdrmfgp)
+ MCFG_VIDEO_UPDATE(qdrmfgp)
- MDRV_K056832_ADD("k056832", qdrmfgp_k056832_intf)
- MDRV_K053252_ADD("k053252")
+ MCFG_K056832_ADD("k056832", qdrmfgp_k056832_intf)
+ MCFG_K053252_ADD("k053252")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami", K054539, 18432000/384)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami", K054539, 18432000/384)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( qdrmfgp2, qdrmfgp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.000 MHz */
- MDRV_CPU_PROGRAM_MAP(qdrmfgp2_map)
- MDRV_CPU_VBLANK_INT("screen", qdrmfgp2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(qdrmfgp2_map)
+ MCFG_CPU_VBLANK_INT("screen", qdrmfgp2_interrupt)
- MDRV_MACHINE_START(qdrmfgp2)
- MDRV_MACHINE_RESET(qdrmfgp)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(qdrmfgp2)
+ MCFG_MACHINE_RESET(qdrmfgp)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_IDE_CONTROLLER_ADD("ide", gp2_ide_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", gp2_ide_interrupt)
/* 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(40, 40+384-1, 16, 16+224-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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 16, 16+224-1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(qdrmfgp2)
- MDRV_VIDEO_UPDATE(qdrmfgp)
+ MCFG_VIDEO_START(qdrmfgp2)
+ MCFG_VIDEO_UPDATE(qdrmfgp)
- MDRV_K056832_ADD("k056832", qdrmfgp2_k056832_intf)
- MDRV_K053252_ADD("k053252")
+ MCFG_K056832_ADD("k056832", qdrmfgp2_k056832_intf)
+ MCFG_K053252_ADD("k053252")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami", K054539, 18432000/384)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami", K054539, 18432000/384)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 51a14a4f533..1c9265c7f2f 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -552,28 +552,28 @@ static const m6809_config encryption_config =
static MACHINE_CONFIG_START( qix_base, qix_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_CONFIG(encryption_config) // for kram3
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_CONFIG(encryption_config) // for kram3
/* high interleave needed to ensure correct text in service mode */
/* Zookeeper settings and high score table seem especially sensitive to this */
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_RESET(qix)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(qix)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", qix_pia_0_intf)
- MDRV_PIA6821_ADD("pia1", qix_pia_1_intf)
- MDRV_PIA6821_ADD("pia2", qix_pia_2_intf)
+ MCFG_PIA6821_ADD("pia0", qix_pia_0_intf)
+ MCFG_PIA6821_ADD("pia1", qix_pia_1_intf)
+ MCFG_PIA6821_ADD("pia2", qix_pia_2_intf)
/* video hardware */
- MDRV_FRAGMENT_ADD(qix_video)
+ MCFG_FRAGMENT_ADD(qix_video)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qix, qix_base )
- MDRV_FRAGMENT_ADD(qix_audio)
+ MCFG_FRAGMENT_ADD(qix_audio)
MACHINE_CONFIG_END
@@ -581,13 +581,13 @@ static MACHINE_CONFIG_DERIVED( mcu, qix )
/* basic machine hardware */
- MDRV_CPU_ADD("mcu", M68705, COIN_CLOCK_OSC) /* 1.00 MHz */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", M68705, COIN_CLOCK_OSC) /* 1.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_MACHINE_START(qixmcu)
+ MCFG_MACHINE_START(qixmcu)
- MDRV_PIA6821_MODIFY("pia0", qixmcu_pia_0_intf)
- MDRV_PIA6821_MODIFY("pia2", qixmcu_pia_2_intf)
+ MCFG_PIA6821_MODIFY("pia0", qixmcu_pia_0_intf)
+ MCFG_PIA6821_MODIFY("pia2", qixmcu_pia_2_intf)
MACHINE_CONFIG_END
@@ -595,11 +595,11 @@ static MACHINE_CONFIG_DERIVED( zookeep, mcu )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(zoo_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(zoo_main_map)
/* video hardware */
- MDRV_FRAGMENT_ADD(zookeep_video)
+ MCFG_FRAGMENT_ADD(zookeep_video)
MACHINE_CONFIG_END
@@ -607,17 +607,17 @@ static MACHINE_CONFIG_DERIVED( slither, qix_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
- MDRV_PIA6821_MODIFY("pia1", slither_pia_1_intf)
- MDRV_PIA6821_MODIFY("pia2", slither_pia_2_intf)
+ MCFG_PIA6821_MODIFY("pia1", slither_pia_1_intf)
+ MCFG_PIA6821_MODIFY("pia2", slither_pia_2_intf)
/* video hardware */
- MDRV_FRAGMENT_ADD(slither_video)
+ MCFG_FRAGMENT_ADD(slither_video)
/* audio hardware */
- MDRV_FRAGMENT_ADD(slither_audio)
+ MCFG_FRAGMENT_ADD(slither_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c
index 15164d7ce5b..78ef3c1e802 100644
--- a/src/mame/drivers/quakeat.c
+++ b/src/mame/drivers/quakeat.c
@@ -149,27 +149,27 @@ static MACHINE_START(quakeat)
static MACHINE_CONFIG_START( quake, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PENTIUM, 233000000) /* Pentium II, 233MHz */
- MDRV_CPU_PROGRAM_MAP(quake_map)
- MDRV_CPU_IO_MAP(quake_io)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 233000000) /* Pentium II, 233MHz */
+ MCFG_CPU_PROGRAM_MAP(quake_map)
+ MCFG_CPU_IO_MAP(quake_io)
- MDRV_MACHINE_START(quakeat)
+ MCFG_MACHINE_START(quakeat)
- MDRV_PIC8259_ADD( "pic8259_1", quakeat_pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", quakeat_pic8259_2_config )
+ MCFG_PIC8259_ADD( "pic8259_1", quakeat_pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_2", quakeat_pic8259_2_config )
/* video hardware */
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(quake)
- MDRV_VIDEO_UPDATE(quake)
+ MCFG_VIDEO_START(quake)
+ MCFG_VIDEO_UPDATE(quake)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 62af0207e04..66f4baaaa0e 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -229,31 +229,31 @@ static const pokey_interface pokey_interface_2 =
static MACHINE_CONFIG_START( quantum, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, (double)MASTER_CLOCK / 4096 / 12)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, (double)MASTER_CLOCK / 4096 / 12)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 900, 0, 600)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 900, 0, 600)
- MDRV_VIDEO_START(avg_quantum)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(avg_quantum)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, 600000)
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, 600000)
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, 600000)
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, 600000)
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 61b499437f0..6f8297b2d0c 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -362,44 +362,44 @@ static MACHINE_RESET( quasar )
static MACHINE_CONFIG_START( quasar, cvs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */
- MDRV_CPU_PROGRAM_MAP(quasar)
- MDRV_CPU_IO_MAP(quasar_io)
- MDRV_CPU_VBLANK_INT("screen", quasar_interrupt)
+ MCFG_CPU_ADD("maincpu", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */
+ MCFG_CPU_PROGRAM_MAP(quasar)
+ MCFG_CPU_IO_MAP(quasar_io)
+ MCFG_CPU_VBLANK_INT("screen", quasar_interrupt)
- MDRV_CPU_ADD("soundcpu",I8035,6000000) /* 6MHz crystal divide by 15 in CPU */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("soundcpu",I8035,6000000) /* 6MHz crystal divide by 15 in CPU */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_START(quasar)
- MDRV_MACHINE_RESET(quasar)
+ MCFG_MACHINE_START(quasar)
+ MCFG_MACHINE_RESET(quasar)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50) /* From dot clock */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(1*8+1, 29*8-1, 2*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50) /* From dot clock */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(1*8+1, 29*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(quasar)
- MDRV_PALETTE_LENGTH((64+1)*8+(4*256))
+ MCFG_GFXDECODE(quasar)
+ MCFG_PALETTE_LENGTH((64+1)*8+(4*256))
- MDRV_S2636_ADD("s2636_0", s2636_0_config)
- MDRV_S2636_ADD("s2636_1", s2636_1_config)
- MDRV_S2636_ADD("s2636_2", s2636_2_config)
+ MCFG_S2636_ADD("s2636_0", s2636_0_config)
+ MCFG_S2636_ADD("s2636_1", s2636_1_config)
+ MCFG_S2636_ADD("s2636_2", s2636_2_config)
- MDRV_PALETTE_INIT(quasar)
- MDRV_VIDEO_START(quasar)
- MDRV_VIDEO_UPDATE(quasar)
+ MCFG_PALETTE_INIT(quasar)
+ MCFG_VIDEO_START(quasar)
+ MCFG_VIDEO_UPDATE(quasar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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
ROM_START( quasar )
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index ee1ce1681d4..9cc5f2c7a01 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -72,21 +72,21 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( queen, driver_device )
- MDRV_CPU_ADD("maincpu", PENTIUM, 533000000) // Celeron or Pentium 3, 533 Mhz
- MDRV_CPU_PROGRAM_MAP(queen_map)
- MDRV_CPU_IO_MAP(queen_io)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 533000000) // Celeron or Pentium 3, 533 Mhz
+ MCFG_CPU_PROGRAM_MAP(queen_map)
+ MCFG_CPU_IO_MAP(queen_io)
- 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, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(queen)
- MDRV_VIDEO_UPDATE(queen)
+ MCFG_VIDEO_START(queen)
+ MCFG_VIDEO_UPDATE(queen)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index 9d7ebdf86d9..c66e06a0673 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -444,45 +444,45 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( quizdna, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
- MDRV_CPU_PROGRAM_MAP(quizdna_map)
- MDRV_CPU_IO_MAP(quizdna_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(quizdna_map)
+ MCFG_CPU_IO_MAP(quizdna_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* 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(8*8, 56*8-1, 2*8, 30*8-1)
+ 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(8*8, 56*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(quizdna)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(quizdna)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(quizdna)
- MDRV_VIDEO_UPDATE(quizdna)
+ MCFG_VIDEO_START(quizdna)
+ MCFG_VIDEO_UPDATE(quizdna)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, MCLK/4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2203, MCLK/4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_OKIM6295_ADD("oki", (MCLK/1024)*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_OKIM6295_ADD("oki", (MCLK/1024)*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gakupara, quizdna )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(gakupara_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(gakupara_io_map)
MACHINE_CONFIG_END
@@ -490,9 +490,9 @@ static MACHINE_CONFIG_DERIVED( gekiretu, quizdna )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gekiretu_map)
- MDRV_CPU_IO_MAP(gekiretu_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gekiretu_map)
+ MCFG_CPU_IO_MAP(gekiretu_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index 2f66e14e4bf..eaeab4145f9 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -200,29 +200,29 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( quizo, quizo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,XTAL1/2)
- MDRV_CPU_PROGRAM_MAP(memmap)
- MDRV_CPU_IO_MAP(portmap)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL1/2)
+ MCFG_CPU_PROGRAM_MAP(memmap)
+ MCFG_CPU_IO_MAP(portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ 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(320, 200)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8, 200-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(320, 200)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8, 200-1)
- MDRV_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(quizo)
+ MCFG_PALETTE_LENGTH(16)
+ MCFG_PALETTE_INIT(quizo)
- MDRV_VIDEO_UPDATE(quizo)
+ MCFG_VIDEO_UPDATE(quizo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL2/16 )
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL2/16 )
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index c6cc6adabcb..8cbba799a5d 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -195,30 +195,30 @@ static const nmk112_interface quizpani_nmk112_intf =
static MACHINE_CONFIG_START( quizpani, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(quizpani_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold,164) // music tempo
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(quizpani_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold,164) // music tempo
- MDRV_GFXDECODE(quizpani)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(quizpani)
+ MCFG_PALETTE_LENGTH(0x200)
- 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, 48*8-1, 0*8, 28*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 28*8-1)
- MDRV_VIDEO_START(quizpani)
- MDRV_VIDEO_UPDATE(quizpani)
+ MCFG_VIDEO_START(quizpani)
+ MCFG_VIDEO_UPDATE(quizpani)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 16000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_NMK112_ADD("nmk112", quizpani_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", quizpani_nmk112_intf)
MACHINE_CONFIG_END
ROM_START( quizpani )
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index 6b8034af461..38e2cc42ca1 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -417,38 +417,38 @@ GFXDECODE_END
static MACHINE_CONFIG_START( quizpun2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) // 4 MHz?
- MDRV_CPU_PROGRAM_MAP(quizpun2_map)
- MDRV_CPU_IO_MAP(quizpun2_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz / 2) // 4 MHz?
- MDRV_CPU_PROGRAM_MAP(quizpun2_sound_map)
- MDRV_CPU_IO_MAP(quizpun2_sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) // 4 MHz?
+ MCFG_CPU_PROGRAM_MAP(quizpun2_map)
+ MCFG_CPU_IO_MAP(quizpun2_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz / 2) // 4 MHz?
+ MCFG_CPU_PROGRAM_MAP(quizpun2_sound_map)
+ MCFG_CPU_IO_MAP(quizpun2_sound_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
// NMI generated by main CPU
- MDRV_MACHINE_RESET( quizpun2 )
+ MCFG_MACHINE_RESET( quizpun2 )
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
- MDRV_GFXDECODE(quizpun2)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(quizpun2)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(quizpun2)
- MDRV_VIDEO_UPDATE(quizpun2)
+ MCFG_VIDEO_START(quizpun2)
+ MCFG_VIDEO_UPDATE(quizpun2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_8MHz / 4 ) // 2 MHz?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_8MHz / 4 ) // 2 MHz?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 9eff3affbc5..d9a58ae5f1b 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -517,41 +517,41 @@ INPUT_PORTS_END
*************************************/
static MACHINE_CONFIG_START( r2dtank, driver_device )
- MDRV_CPU_ADD("maincpu", M6809,3000000) /* ?? too fast ? */
- MDRV_CPU_PROGRAM_MAP(r2dtank_main_map)
+ MCFG_CPU_ADD("maincpu", M6809,3000000) /* ?? too fast ? */
+ MCFG_CPU_PROGRAM_MAP(r2dtank_main_map)
- MDRV_CPU_ADD("audiocpu", M6802,3000000) /* ?? */
- MDRV_CPU_PROGRAM_MAP(r2dtank_audio_map)
+ MCFG_CPU_ADD("audiocpu", M6802,3000000) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(r2dtank_audio_map)
- MDRV_MACHINE_START(r2dtank)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(r2dtank)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_UPDATE(r2dtank)
+ MCFG_VIDEO_UPDATE(r2dtank)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
- MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
/* 74LS123 */
- MDRV_TTL74123_ADD("74123", ttl74123_intf)
+ MCFG_TTL74123_ADD("74123", ttl74123_intf)
- MDRV_PIA6821_ADD("pia_main", pia_main_intf)
- MDRV_PIA6821_ADD("pia_audio", pia_audio_intf)
+ MCFG_PIA6821_ADD("pia_main", pia_main_intf)
+ MCFG_PIA6821_ADD("pia_audio", pia_audio_intf)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, (4000000 / 4))
- MDRV_SOUND_CONFIG(ay8910_1_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, (4000000 / 4))
+ MCFG_SOUND_CONFIG(ay8910_1_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, (4000000 / 4))
- MDRV_SOUND_CONFIG(ay8910_2_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, (4000000 / 4))
+ MCFG_SOUND_CONFIG(ay8910_2_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c
index 5f2c34e4c7a..15b57b6b60b 100644
--- a/src/mame/drivers/r2dx_v33.c
+++ b/src/mame/drivers/r2dx_v33.c
@@ -642,61 +642,61 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( rdx_v33, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V33, 32000000/2 ) // ?
- MDRV_CPU_PROGRAM_MAP(rdx_v33_map)
- MDRV_CPU_VBLANK_INT("screen", rdx_v33_interrupt)
+ MCFG_CPU_ADD("maincpu", V33, 32000000/2 ) // ?
+ MCFG_CPU_PROGRAM_MAP(rdx_v33_map)
+ MCFG_CPU_VBLANK_INT("screen", rdx_v33_interrupt)
- //MDRV_MACHINE_RESET(rdx_v33)
+ //MCFG_MACHINE_RESET(rdx_v33)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ 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, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(rdx_v33)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(rdx_v33)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(rdx_v33)
- MDRV_VIDEO_UPDATE(rdx_v33)
+ MCFG_VIDEO_START(rdx_v33)
+ MCFG_VIDEO_UPDATE(rdx_v33)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( nzerotea, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V33,XTAL_32MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(nzerotea_map)
- MDRV_CPU_VBLANK_INT("screen", rdx_v33_interrupt)
+ MCFG_CPU_ADD("maincpu", V33,XTAL_32MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(nzerotea_map)
+ MCFG_CPU_VBLANK_INT("screen", rdx_v33_interrupt)
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
// SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(14318180/4)
SEIBU_NEWZEROTEAM_SOUND_SYSTEM_CPU(14318180/4)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate *//2)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1)
- MDRV_GFXDECODE(rdx_v33)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(rdx_v33)
- MDRV_VIDEO_UPDATE(rdx_v33)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate *//2)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1)
+ MCFG_GFXDECODE(rdx_v33)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(rdx_v33)
+ MCFG_VIDEO_UPDATE(rdx_v33)
/* sound hardware */
// SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(28636360/8,28636360/28,1,2)
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index b537a5c8911..501d836150a 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -936,27 +936,27 @@ static INTERRUPT_GEN( rabbit_interrupts )
}
static MACHINE_CONFIG_START( rabbit, driver_device )
- MDRV_CPU_ADD("maincpu",M68EC020,24000000) /* 24 MHz */
- MDRV_CPU_PROGRAM_MAP(rabbit_map)
- MDRV_CPU_VBLANK_INT_HACK(rabbit_interrupts,262)
- MDRV_EEPROM_93C46_ADD("eeprom")
-
- MDRV_GFXDECODE(rabbit)
-
- 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*16, 64*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
-// MDRV_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*16, 64*16-1)
-// MDRV_SCREEN_VISIBLE_AREA(0*8, 20*16-1, 32*16, 48*16-1)
-
- MDRV_PALETTE_LENGTH(0x4000)
- MDRV_PALETTE_INIT( all_black ) // the status bar palette doesn't get transfered (or our colour select is wrong).. more obvious when it's black than in 'MAME default' colours
-
- MDRV_VIDEO_START(rabbit)
- MDRV_VIDEO_UPDATE(rabbit)
+ MCFG_CPU_ADD("maincpu",M68EC020,24000000) /* 24 MHz */
+ MCFG_CPU_PROGRAM_MAP(rabbit_map)
+ MCFG_CPU_VBLANK_INT_HACK(rabbit_interrupts,262)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+
+ MCFG_GFXDECODE(rabbit)
+
+ 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*16, 64*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*16, 64*16-1)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 20*16-1, 32*16, 48*16-1)
+
+ MCFG_PALETTE_LENGTH(0x4000)
+ MCFG_PALETTE_INIT( all_black ) // the status bar palette doesn't get transfered (or our colour select is wrong).. more obvious when it's black than in 'MAME default' colours
+
+ MCFG_VIDEO_START(rabbit)
+ MCFG_VIDEO_UPDATE(rabbit)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 4c12c701e03..88b119dbb1f 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -252,57 +252,57 @@ static VIDEO_EOF( raiden )
static MACHINE_CONFIG_START( raiden, raiden_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", raiden_interrupt)
+ MCFG_CPU_ADD("maincpu", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", raiden_interrupt)
- MDRV_CPU_ADD("sub", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT("screen", raiden_interrupt)
+ MCFG_CPU_ADD("sub", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT("screen", raiden_interrupt)
SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.60) /* verified on pcb */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.60) /* verified on pcb */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(raiden)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(raiden)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(raiden)
- MDRV_VIDEO_EOF(raiden)
- MDRV_VIDEO_UPDATE(raiden)
+ MCFG_VIDEO_START(raiden)
+ MCFG_VIDEO_EOF(raiden)
+ MCFG_VIDEO_UPDATE(raiden)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_14_31818MHz/4,XTAL_12MHz/12) // frequency and pin 7 verified (pin set in audio\seibu.h)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( raidena, raiden )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(alt_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(alt_main_map)
- MDRV_VIDEO_START(raidena)
+ MCFG_VIDEO_START(raidena)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( raidenu, raiden )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(raidenu_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(raidenu_main_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(raidenu_sub_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(raidenu_sub_map)
- MDRV_VIDEO_START(raidena)
+ MCFG_VIDEO_START(raidena)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 8cd3271ffab..405beb18814 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -1394,29 +1394,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( raiden2, raiden2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(raiden2_mem)
- MDRV_CPU_VBLANK_INT("screen", raiden2_interrupt)
+ MCFG_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(raiden2_mem)
+ MCFG_CPU_VBLANK_INT("screen", raiden2_interrupt)
- MDRV_MACHINE_RESET(raiden2)
+ MCFG_MACHINE_RESET(raiden2)
SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(14318180/4)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate *//2)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 30*8-1)
- MDRV_GFXDECODE(raiden2)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate *//2)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 30*8-1)
+ MCFG_GFXDECODE(raiden2)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(raiden2)
- MDRV_VIDEO_UPDATE(raiden2)
+ MCFG_VIDEO_START(raiden2)
+ MCFG_VIDEO_UPDATE(raiden2)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(28636360/8,28636360/28,1,2)
@@ -1428,42 +1428,42 @@ static MACHINE_CONFIG_START( raiden2, raiden2_state )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( xsedae, raiden2 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(xsedae_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(xsedae_mem)
- MDRV_MACHINE_RESET(xsedae)
+ MCFG_MACHINE_RESET(xsedae)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( zeroteam, raiden2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(zeroteam_mem)
- MDRV_CPU_VBLANK_INT("screen", raiden2_interrupt)
+ MCFG_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(zeroteam_mem)
+ MCFG_CPU_VBLANK_INT("screen", raiden2_interrupt)
- MDRV_MACHINE_RESET(zeroteam)
+ MCFG_MACHINE_RESET(zeroteam)
SEIBU_NEWZEROTEAM_SOUND_SYSTEM_CPU(14318180/4)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate *//2)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1)
- MDRV_GFXDECODE(raiden2)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(raiden2)
- MDRV_VIDEO_UPDATE(raiden2)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55.47) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate *//2)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0, 32*8-1)
+ MCFG_GFXDECODE(raiden2)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(raiden2)
+ MCFG_VIDEO_UPDATE(raiden2)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000)
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 6beaa219d39..cd1b1757558 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -678,42 +678,42 @@ static MACHINE_START( rainbow )
static MACHINE_CONFIG_START( rainbow, rainbow_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rainbow_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rainbow_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rainbow_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rainbow_sound_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(rainbow)
+ MCFG_MACHINE_START(rainbow)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(rainbow)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(rainbow)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_UPDATE(rainbow)
+ MCFG_VIDEO_UPDATE(rainbow)
- MDRV_PC080SN_ADD("pc080sn", rainbow_pc080sn_intf)
- MDRV_PC090OJ_ADD("pc090oj", rainbow_pc090oj_intf)
+ MCFG_PC080SN_ADD("pc080sn", rainbow_pc080sn_intf)
+ MCFG_PC090OJ_ADD("pc090oj", rainbow_pc090oj_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_TC0140SYT_ADD("tc0140syt", rainbow_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", rainbow_tc0140syt_intf)
MACHINE_CONFIG_END
@@ -721,41 +721,41 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jumping, rainbow_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/3) /* not verified but matches original */
- MDRV_CPU_PROGRAM_MAP(jumping_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3) /* not verified but matches original */
+ MCFG_CPU_PROGRAM_MAP(jumping_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* not verified but music tempo matches original */
- MDRV_CPU_PROGRAM_MAP(jumping_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* not verified but music tempo matches original */
+ MCFG_CPU_PROGRAM_MAP(jumping_sound_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough ? */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough ? */
- MDRV_MACHINE_START(rainbow)
+ MCFG_MACHINE_START(rainbow)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(jumping)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(jumping)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(jumping)
- MDRV_VIDEO_UPDATE(jumping)
+ MCFG_VIDEO_START(jumping)
+ MCFG_VIDEO_UPDATE(jumping)
- MDRV_PC080SN_ADD("pc080sn", jumping_pc080sn_intf)
+ MCFG_PC080SN_ADD("pc080sn", jumping_pc080sn_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_18_432MHz/6) /* not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_18_432MHz/6) /* not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_18_432MHz/6) /* not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_18_432MHz/6) /* not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index b808f9627c5..33699651e06 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -895,73 +895,73 @@ static MACHINE_RESET( rallyx )
static MACHINE_CONFIG_START( rallyx, rallyx_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(rallyx_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(rallyx_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_MACHINE_START(rallyx)
- MDRV_MACHINE_RESET(rallyx)
+ MCFG_MACHINE_START(rallyx)
+ MCFG_MACHINE_RESET(rallyx)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(rallyx)
- MDRV_PALETTE_LENGTH(64*4+4)
+ MCFG_GFXDECODE(rallyx)
+ MCFG_PALETTE_LENGTH(64*4+4)
- MDRV_PALETTE_INIT(rallyx)
- MDRV_VIDEO_START(rallyx)
- MDRV_VIDEO_UPDATE(rallyx)
+ MCFG_PALETTE_INIT(rallyx)
+ MCFG_VIDEO_START(rallyx)
+ MCFG_VIDEO_UPDATE(rallyx)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32) /* 96 KHz */
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32) /* 96 KHz */
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(rallyx_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(rallyx_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jungler, rallyx_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(jungler_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(jungler_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(rallyx)
- MDRV_MACHINE_RESET(rallyx)
+ MCFG_MACHINE_START(rallyx)
+ MCFG_MACHINE_RESET(rallyx)
/* 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) /* frames per second, vblank duration */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*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) /* frames per second, vblank duration */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(jungler)
- MDRV_PALETTE_LENGTH(64*4+4+64)
+ MCFG_GFXDECODE(jungler)
+ MCFG_PALETTE_LENGTH(64*4+4+64)
- MDRV_PALETTE_INIT(jungler)
- MDRV_VIDEO_START(jungler)
- MDRV_VIDEO_UPDATE(jungler)
+ MCFG_PALETTE_INIT(jungler)
+ MCFG_VIDEO_START(jungler)
+ MCFG_VIDEO_UPDATE(jungler)
/* sound hardware */
- MDRV_FRAGMENT_ADD(locomotn_sound)
+ MCFG_FRAGMENT_ADD(locomotn_sound)
MACHINE_CONFIG_END
@@ -970,8 +970,8 @@ static MACHINE_CONFIG_DERIVED( tactcian, jungler )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_START(locomotn)
- MDRV_VIDEO_UPDATE(locomotn)
+ MCFG_VIDEO_START(locomotn)
+ MCFG_VIDEO_UPDATE(locomotn)
MACHINE_CONFIG_END
@@ -980,10 +980,10 @@ static MACHINE_CONFIG_DERIVED( locomotn, jungler )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_VIDEO_START(locomotn)
- MDRV_VIDEO_UPDATE(locomotn)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_VIDEO_START(locomotn)
+ MCFG_VIDEO_UPDATE(locomotn)
MACHINE_CONFIG_END
@@ -992,10 +992,10 @@ static MACHINE_CONFIG_DERIVED( commsega, jungler )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_VIDEO_START(commsega)
- MDRV_VIDEO_UPDATE(locomotn)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_VIDEO_START(commsega)
+ MCFG_VIDEO_UPDATE(locomotn)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 491c384458f..5a3dcf8d429 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -344,37 +344,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( rampart, rampart_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(rampart)
- MDRV_MACHINE_RESET(rampart)
- MDRV_NVRAM_ADD_1FILL("eeprom")
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_START(rampart)
+ MCFG_MACHINE_RESET(rampart)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
+ MCFG_WATCHDOG_VBLANK_INIT(8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(rampart)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(rampart)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240)
- MDRV_VIDEO_START(rampart)
- MDRV_VIDEO_UPDATE(rampart)
+ MCFG_VIDEO_START(rampart)
+ MCFG_VIDEO_UPDATE(rampart)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("ymsnd", YM2413, MASTER_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, MASTER_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 098a4c42db8..03a8370dc39 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -412,47 +412,47 @@ static const tc0140syt_interface rastan_tc0140syt_intf =
static MACHINE_CONFIG_START( rastan, rastan_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rastan_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rastan_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rastan_s_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rastan_s_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(rastan)
- MDRV_MACHINE_RESET(rastan)
+ MCFG_MACHINE_START(rastan)
+ MCFG_MACHINE_RESET(rastan)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(rastan)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(rastan)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_UPDATE(rastan)
+ MCFG_VIDEO_UPDATE(rastan)
- MDRV_PC080SN_ADD("pc080sn", rastan_pc080sn_intf)
- MDRV_PC090OJ_ADD("pc090oj", rastan_pc090oj_intf)
+ MCFG_PC080SN_ADD("pc080sn", rastan_pc080sn_intf)
+ MCFG_PC090OJ_ADD("pc090oj", rastan_pc090oj_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_TC0140SYT_ADD("tc0140syt", rastan_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", rastan_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 10af89bc31f..a229e08141e 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -513,43 +513,43 @@ static INTERRUPT_GEN( mcu_irq )
}
static MACHINE_CONFIG_START( rbmk, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 22000000 /2)
- MDRV_CPU_PROGRAM_MAP(rbmk_mem)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 22000000 /2)
+ MCFG_CPU_PROGRAM_MAP(rbmk_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("mcu", AT89C4051, 22000000 / 4) // frequency isn't right
- MDRV_CPU_PROGRAM_MAP(rbmk_mcu_mem)
- MDRV_CPU_IO_MAP(rbmk_mcu_io)
- MDRV_CPU_VBLANK_INT("screen", mcu_irq)
+ MCFG_CPU_ADD("mcu", AT89C4051, 22000000 / 4) // frequency isn't right
+ MCFG_CPU_PROGRAM_MAP(rbmk_mcu_mem)
+ MCFG_CPU_IO_MAP(rbmk_mcu_io)
+ MCFG_CPU_VBLANK_INT("screen", mcu_irq)
- MDRV_GFXDECODE(rbmk)
+ MCFG_GFXDECODE(rbmk)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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, 64*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(rbmk)
- MDRV_VIDEO_UPDATE(rbmk)
+ MCFG_VIDEO_START(rbmk)
+ MCFG_VIDEO_UPDATE(rbmk)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
- MDRV_SOUND_ADD("ymsnd", YM2151, 22000000 / 8)
-// MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 22000000 / 8)
+// MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MACHINE_CONFIG_END
ROM_START( rbmk )
diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c
index 6a8445d52a5..7d6adbe4a23 100644
--- a/src/mame/drivers/rcorsair.c
+++ b/src/mame/drivers/rcorsair.c
@@ -111,22 +111,22 @@ static MACHINE_CONFIG_START( rcorsair, driver_device )
/* Main CPU is probably inside Custom Block with
program code, unknown type */
- MDRV_CPU_ADD("maincpu", I8085A,8000000) /* Sound CPU? */
- MDRV_CPU_PROGRAM_MAP(rcorsair_map)
-// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
-
- MDRV_GFXDECODE(rcorsair)
- MDRV_PALETTE_LENGTH(0x100)
-
- MDRV_VIDEO_START(rcorsair)
- MDRV_VIDEO_UPDATE(rcorsair)
+ MCFG_CPU_ADD("maincpu", I8085A,8000000) /* Sound CPU? */
+ MCFG_CPU_PROGRAM_MAP(rcorsair_map)
+// MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
+
+ MCFG_GFXDECODE(rcorsair)
+ MCFG_PALETTE_LENGTH(0x100)
+
+ MCFG_VIDEO_START(rcorsair)
+ MCFG_VIDEO_UPDATE(rcorsair)
MACHINE_CONFIG_END
ROM_START( rcorsair )
diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c
index 680fea2b26a..e6bac0ad925 100644
--- a/src/mame/drivers/re900.c
+++ b/src/mame/drivers/re900.c
@@ -391,31 +391,31 @@ static const ay8910_interface ay8910_bs94 =
static MACHINE_CONFIG_START( re900, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8051, MAIN_CLOCK)
- MDRV_CPU_PROGRAM_MAP(mem_prg)
- MDRV_CPU_IO_MAP(mem_io)
- MDRV_CPU_VBLANK_INT("screen", re900_video_interrupt)
+ MCFG_CPU_ADD("maincpu", I8051, MAIN_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(mem_prg)
+ MCFG_CPU_IO_MAP(mem_io)
+ MCFG_CPU_VBLANK_INT("screen", re900_video_interrupt)
/* video hardware */
- MDRV_FRAGMENT_ADD(tms9928a)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_FRAGMENT_ADD(tms9928a)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(60)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay_re900", AY8910, TMS_CLOCK) /* From TMS9128NL - Pin 37 (GROMCLK) */
- MDRV_SOUND_CONFIG(ay8910_re900)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay_re900", AY8910, TMS_CLOCK) /* From TMS9128NL - Pin 37 (GROMCLK) */
+ MCFG_SOUND_CONFIG(ay8910_re900)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bs94, re900 )
/* sound hardware */
- MDRV_SOUND_MODIFY("ay_re900")
- MDRV_SOUND_CONFIG(ay8910_bs94)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_MODIFY("ay_re900")
+ MCFG_SOUND_CONFIG(ay8910_bs94)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index b08a2e55655..14ec506d564 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -676,55 +676,55 @@ static INTERRUPT_GEN( realbrk_interrupt )
static MACHINE_CONFIG_START( realbrk, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000, XTAL_32MHz / 2) /* !! TMP68301 !! */
- MDRV_CPU_PROGRAM_MAP(realbrk_mem)
- MDRV_CPU_VBLANK_INT("screen", realbrk_interrupt)
+ MCFG_CPU_ADD("maincpu",M68000, XTAL_32MHz / 2) /* !! TMP68301 !! */
+ MCFG_CPU_PROGRAM_MAP(realbrk_mem)
+ MCFG_CPU_VBLANK_INT("screen", realbrk_interrupt)
- MDRV_MACHINE_START( tmp68301 )
- MDRV_MACHINE_RESET( tmp68301 )
+ MCFG_MACHINE_START( tmp68301 )
+ MCFG_MACHINE_RESET( tmp68301 )
/* 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(0x140, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-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(0x140, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
- MDRV_GFXDECODE(realbrk)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(realbrk)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_VIDEO_START(realbrk)
- MDRV_VIDEO_UPDATE(realbrk)
+ MCFG_VIDEO_START(realbrk)
+ MCFG_VIDEO_UPDATE(realbrk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_33_8688MHz / 2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_33_8688MHz / 2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pkgnsh, realbrk )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pkgnsh_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pkgnsh_mem)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pkgnshdx, realbrk )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pkgnshdx_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pkgnshdx_mem)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dai2kaku, realbrk )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dai2kaku_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dai2kaku_mem)
- MDRV_GFXDECODE(dai2kaku)
- MDRV_VIDEO_UPDATE(dai2kaku)
+ MCFG_GFXDECODE(dai2kaku)
+ MCFG_VIDEO_UPDATE(dai2kaku)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 973aedfcc16..3ef8c69ee55 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -388,57 +388,57 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( redalert, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(redalert_main_map)
- MDRV_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(redalert_main_map)
+ MCFG_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
/* video hardware */
- MDRV_FRAGMENT_ADD(redalert_video)
+ MCFG_FRAGMENT_ADD(redalert_video)
/* audio hardware */
- MDRV_FRAGMENT_ADD(redalert_audio)
+ MCFG_FRAGMENT_ADD(redalert_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ww3, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(ww3_main_map)
- MDRV_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(ww3_main_map)
+ MCFG_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
/* video hardware */
- MDRV_FRAGMENT_ADD(ww3_video)
+ MCFG_FRAGMENT_ADD(ww3_video)
/* audio hardware */
- MDRV_FRAGMENT_ADD(ww3_audio)
+ MCFG_FRAGMENT_ADD(ww3_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( panther, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(panther_main_map)
- MDRV_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(panther_main_map)
+ MCFG_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
/* video hardware */
- MDRV_FRAGMENT_ADD(panther_video)
+ MCFG_FRAGMENT_ADD(panther_video)
/* audio hardware */
- MDRV_FRAGMENT_ADD(ww3_audio)
+ MCFG_FRAGMENT_ADD(ww3_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( demoneye, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(demoneye_main_map)
- MDRV_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(demoneye_main_map)
+ MCFG_CPU_VBLANK_INT("screen", redalert_vblank_interrupt)
/* video hardware */
- MDRV_FRAGMENT_ADD(demoneye_video)
+ MCFG_FRAGMENT_ADD(demoneye_video)
/* audio hardware */
- MDRV_FRAGMENT_ADD(demoneye_audio)
+ MCFG_FRAGMENT_ADD(demoneye_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index 89f9063afdb..64f41ee1f9d 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -357,27 +357,27 @@ static MACHINE_RESET( redclash )
static MACHINE_CONFIG_START( zerohour, ladybug_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(zerohour_map)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(zerohour_map)
- MDRV_MACHINE_START(redclash)
- MDRV_MACHINE_RESET(redclash)
+ MCFG_MACHINE_START(redclash)
+ MCFG_MACHINE_RESET(redclash)
/* 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(1*8, 31*8-1, 4*8, 28*8-1)
+ 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(1*8, 31*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(redclash)
- MDRV_PALETTE_LENGTH(4*8+4*16+32)
+ MCFG_GFXDECODE(redclash)
+ MCFG_PALETTE_LENGTH(4*8+4*16+32)
- MDRV_PALETTE_INIT(redclash)
- MDRV_VIDEO_START(redclash)
- MDRV_VIDEO_UPDATE(redclash)
- MDRV_VIDEO_EOF(redclash)
+ MCFG_PALETTE_INIT(redclash)
+ MCFG_VIDEO_START(redclash)
+ MCFG_VIDEO_UPDATE(redclash)
+ MCFG_VIDEO_EOF(redclash)
/* sound hardware */
MACHINE_CONFIG_END
@@ -386,27 +386,27 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( redclash, ladybug_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(redclash_map)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(redclash_map)
- MDRV_MACHINE_START(redclash)
- MDRV_MACHINE_RESET(redclash)
+ MCFG_MACHINE_START(redclash)
+ MCFG_MACHINE_RESET(redclash)
/* 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(1*8, 31*8-1, 4*8, 28*8-1)
-
- MDRV_GFXDECODE(redclash)
- MDRV_PALETTE_LENGTH(4*8+4*16+32)
-
- MDRV_PALETTE_INIT(redclash)
- MDRV_VIDEO_START(redclash)
- MDRV_VIDEO_UPDATE(redclash)
- MDRV_VIDEO_EOF(redclash)
+ 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(1*8, 31*8-1, 4*8, 28*8-1)
+
+ MCFG_GFXDECODE(redclash)
+ MCFG_PALETTE_LENGTH(4*8+4*16+32)
+
+ MCFG_PALETTE_INIT(redclash)
+ MCFG_VIDEO_START(redclash)
+ MCFG_VIDEO_UPDATE(redclash)
+ MCFG_VIDEO_EOF(redclash)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index aa4489852c2..55c4050f1f2 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -296,35 +296,35 @@ GFXDECODE_END
static MACHINE_CONFIG_START( relief, relief_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(relief)
- MDRV_MACHINE_RESET(relief)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(relief)
+ MCFG_MACHINE_RESET(relief)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(relief)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(relief)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a VAD chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(relief)
- MDRV_VIDEO_UPDATE(relief)
+ MCFG_VIDEO_START(relief)
+ MCFG_VIDEO_UPDATE(relief)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/3, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/3, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2413, ATARI_CLOCK_14MHz/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, ATARI_CLOCK_14MHz/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index f885efa50f9..5b24e07742e 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -921,47 +921,47 @@ static MACHINE_RESET( renegade )
static MACHINE_CONFIG_START( renegade, renegade_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 12000000/8) /* 1.5 MHz (measured) */
- MDRV_CPU_PROGRAM_MAP(renegade_map)
- MDRV_CPU_VBLANK_INT_HACK(renegade_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M6502, 12000000/8) /* 1.5 MHz (measured) */
+ MCFG_CPU_PROGRAM_MAP(renegade_map)
+ MCFG_CPU_VBLANK_INT_HACK(renegade_interrupt,2)
- MDRV_CPU_ADD("audiocpu", M6809, 12000000/8)
- MDRV_CPU_PROGRAM_MAP(renegade_sound_map) /* IRQs are caused by the main CPU */
+ MCFG_CPU_ADD("audiocpu", M6809, 12000000/8)
+ MCFG_CPU_PROGRAM_MAP(renegade_sound_map) /* IRQs are caused by the main CPU */
- MDRV_CPU_ADD("mcu", M68705, 12000000/4) // ?
- MDRV_CPU_PROGRAM_MAP(renegade_mcu_map)
+ MCFG_CPU_ADD("mcu", M68705, 12000000/4) // ?
+ MCFG_CPU_PROGRAM_MAP(renegade_mcu_map)
- MDRV_MACHINE_START(renegade)
- MDRV_MACHINE_RESET(renegade)
+ MCFG_MACHINE_START(renegade)
+ MCFG_MACHINE_RESET(renegade)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)*2) /* not accurate */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)*2) /* not accurate */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0, 30*8-1)
- MDRV_GFXDECODE(renegade)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(renegade)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(renegade)
- MDRV_VIDEO_UPDATE(renegade)
+ MCFG_VIDEO_START(renegade)
+ MCFG_VIDEO_UPDATE(renegade)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, 12000000/4)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, 12000000/4)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("adpcm", RENEGADE_ADPCM, 8000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("adpcm", RENEGADE_ADPCM, 8000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kuniokunb, renegade )
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index 4b4c4bb9973..53ab306384f 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -339,52 +339,52 @@ GFXDECODE_END
static MACHINE_CONFIG_START( retofinv, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", Z80, 18432000/6) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("sub", Z80, 18432000/6) /* 3.072 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,2)
+ MCFG_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,2)
- MDRV_CPU_ADD("68705", M68705,18432000/6) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("68705", M68705,18432000/6) /* 3.072 MHz? */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - enough for the sound CPU to read all commands */
/* 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(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*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(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(retofinv)
- MDRV_PALETTE_LENGTH(256*2+64*16+64*16)
+ MCFG_GFXDECODE(retofinv)
+ MCFG_PALETTE_LENGTH(256*2+64*16+64*16)
- MDRV_PALETTE_INIT(retofinv)
- MDRV_VIDEO_START(retofinv)
- MDRV_VIDEO_UPDATE(retofinv)
+ MCFG_PALETTE_INIT(retofinv)
+ MCFG_VIDEO_START(retofinv)
+ MCFG_VIDEO_UPDATE(retofinv)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("sn1", SN76496, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("sn2", SN76496, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("sn2", SN76496, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
/* bootleg has no mcu */
static MACHINE_CONFIG_DERIVED( retofinb, retofinv )
- MDRV_DEVICE_REMOVE("68705")
+ MCFG_DEVICE_REMOVE("68705")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c
index d2b9f45cf67..fc8874c3323 100644
--- a/src/mame/drivers/rgum.c
+++ b/src/mame/drivers/rgum.c
@@ -251,33 +251,33 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( rgum, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M65C02,24000000/16) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(rgum_map)
-// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M65C02,24000000/16) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(rgum_map)
+// MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
- MDRV_MC6845_ADD("crtc", MC6845, 24000000/16, mc6845_intf) /* unknown clock & type, hand tuned to get ~50 fps (?) */
+ MCFG_MC6845_ADD("crtc", MC6845, 24000000/16, mc6845_intf) /* unknown clock & type, hand tuned to get ~50 fps (?) */
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf )
- MDRV_GFXDECODE(rgum)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(rgum)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(royalgum)
- MDRV_VIDEO_UPDATE(royalgum)
+ MCFG_VIDEO_START(royalgum)
+ MCFG_VIDEO_UPDATE(royalgum)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 24000000/16) /* guessed to use the same xtal as the crtc */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 24000000/16) /* guessed to use the same xtal as the crtc */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 2685575fd3d..54e7670db91 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -440,36 +440,36 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( rmhaihai, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,20000000/4) /* 5 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(rmhaihai_map)
- MDRV_CPU_IO_MAP(rmhaihai_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,20000000/4) /* 5 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(rmhaihai_map)
+ MCFG_CPU_IO_MAP(rmhaihai_io_map)
+ MCFG_CPU_VBLANK_INT("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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(4*8, 60*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(4*8, 60*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(rmhaihai)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(rmhaihai)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(rmhaihai)
- MDRV_VIDEO_UPDATE(rmhaihai)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(rmhaihai)
+ MCFG_VIDEO_UPDATE(rmhaihai)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 20000000/16)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 20000000/16)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("msm", MSM5205, 500000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 500000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rmhaisei, rmhaihai )
@@ -477,23 +477,23 @@ static MACHINE_CONFIG_DERIVED( rmhaisei, rmhaihai )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(themj)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(themj)
+ MCFG_PALETTE_LENGTH(0x200)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( themj, rmhaihai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(themj_map)
- MDRV_CPU_IO_MAP(themj_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(themj_map)
+ MCFG_CPU_IO_MAP(themj_io_map)
- MDRV_MACHINE_RESET(themj)
+ MCFG_MACHINE_RESET(themj)
/* video hardware */
- MDRV_GFXDECODE(themj)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(themj)
+ MCFG_PALETTE_LENGTH(0x200)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index 28dfa9124ca..39bd20bbfc6 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -298,42 +298,42 @@ static MACHINE_RESET( rockrage )
static MACHINE_CONFIG_START( rockrage, rockrage_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8 */
- MDRV_CPU_PROGRAM_MAP(rockrage_map)
- MDRV_CPU_VBLANK_INT("screen", rockrage_interrupt)
+ MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8 */
+ MCFG_CPU_PROGRAM_MAP(rockrage_map)
+ MCFG_CPU_VBLANK_INT("screen", rockrage_interrupt)
- MDRV_CPU_ADD("audiocpu", M6809, 1500000) /* 24MHz/16 */
- MDRV_CPU_PROGRAM_MAP(rockrage_sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, 1500000) /* 24MHz/16 */
+ MCFG_CPU_PROGRAM_MAP(rockrage_sound_map)
- MDRV_MACHINE_START(rockrage)
- MDRV_MACHINE_RESET(rockrage)
+ MCFG_MACHINE_START(rockrage)
+ MCFG_MACHINE_RESET(rockrage)
/* 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)
+ 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)
- MDRV_K007342_ADD("k007342", rockrage_k007342_intf)
- MDRV_K007420_ADD("k007420", rockrage_k007420_intf)
+ MCFG_K007342_ADD("k007342", rockrage_k007342_intf)
+ MCFG_K007420_ADD("k007420", rockrage_k007420_intf)
- MDRV_GFXDECODE(rockrage)
- MDRV_PALETTE_LENGTH(64 + 2*16*16)
+ MCFG_GFXDECODE(rockrage)
+ MCFG_PALETTE_LENGTH(64 + 2*16*16)
- MDRV_PALETTE_INIT(rockrage)
- MDRV_VIDEO_UPDATE(rockrage)
+ MCFG_PALETTE_INIT(rockrage)
+ MCFG_VIDEO_UPDATE(rockrage)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD("vlm", VLM5030, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c
index 755cde5c0cf..60538a27bcf 100644
--- a/src/mame/drivers/rocnrope.c
+++ b/src/mame/drivers/rocnrope.c
@@ -186,27 +186,27 @@ GFXDECODE_END
static MACHINE_CONFIG_START( rocnrope, rocnrope_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK / 3 / 4) /* Verified in schematics */
- MDRV_CPU_PROGRAM_MAP(rocnrope_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK / 3 / 4) /* Verified in schematics */
+ MCFG_CPU_PROGRAM_MAP(rocnrope_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(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_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)
- MDRV_GFXDECODE(rocnrope)
- MDRV_PALETTE_LENGTH(16*16+16*16)
+ MCFG_GFXDECODE(rocnrope)
+ MCFG_PALETTE_LENGTH(16*16+16*16)
- MDRV_PALETTE_INIT(rocnrope)
- MDRV_VIDEO_START(rocnrope)
- MDRV_VIDEO_UPDATE(rocnrope)
+ MCFG_PALETTE_INIT(rocnrope)
+ MCFG_VIDEO_START(rocnrope)
+ MCFG_VIDEO_UPDATE(rocnrope)
/* sound hardware */
- MDRV_FRAGMENT_ADD(timeplt_sound)
+ MCFG_FRAGMENT_ADD(timeplt_sound)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 60140abe9d0..2331baf1213 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -775,179 +775,179 @@ static const deco16ic_interface nitrobal_deco16ic_intf =
static MACHINE_CONFIG_START( rohga, rohga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(rohga_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_assert)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(rohga_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_assert)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MDRV_CPU_PROGRAM_MAP(rohga_sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
+ MCFG_CPU_PROGRAM_MAP(rohga_sound_map)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(rohga)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(rohga)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(rohga)
- MDRV_VIDEO_UPDATE(rohga)
+ MCFG_VIDEO_START(rohga)
+ MCFG_VIDEO_UPDATE(rohga)
- MDRV_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.78)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.78)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.78)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.78)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wizdfire, rohga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(wizdfire_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_assert)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(wizdfire_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_assert)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MDRV_CPU_PROGRAM_MAP(rohga_sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
+ MCFG_CPU_PROGRAM_MAP(rohga_sound_map)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(wizdfire)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(wizdfire)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(wizdfire)
+ MCFG_VIDEO_UPDATE(wizdfire)
- MDRV_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( nitrobal, rohga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(nitrobal_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_assert)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(nitrobal_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_assert)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MDRV_CPU_PROGRAM_MAP(rohga_sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
+ MCFG_CPU_PROGRAM_MAP(rohga_sound_map)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(wizdfire)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(wizdfire)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(nitrobal)
+ MCFG_VIDEO_UPDATE(nitrobal)
- MDRV_DECO16IC_ADD("deco_custom", nitrobal_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", nitrobal_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( schmeisr, rohga_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(schmeisr_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_assert)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(schmeisr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_assert)
- MDRV_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MDRV_CPU_PROGRAM_MAP(rohga_sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
+ MCFG_CPU_PROGRAM_MAP(rohga_sound_map)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(schmeisr)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(schmeisr)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(rohga)
- MDRV_VIDEO_UPDATE(schmeisr)
+ MCFG_VIDEO_START(rohga)
+ MCFG_VIDEO_UPDATE(schmeisr)
- MDRV_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", rohga_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
/**********************************************************************************/
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index eeaa74a4509..e765cdfb2c8 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -264,42 +264,42 @@ static MACHINE_RESET( rollerg )
static MACHINE_CONFIG_START( rollerg, rollerg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(rollerg_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(rollerg_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(rollerg_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(rollerg_sound_map)
/* NMIs are generated by the 053260 */
- MDRV_MACHINE_START(rollerg)
- MDRV_MACHINE_RESET(rollerg)
+ MCFG_MACHINE_START(rollerg)
+ MCFG_MACHINE_RESET(rollerg)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(rollerg)
- MDRV_VIDEO_UPDATE(rollerg)
+ MCFG_VIDEO_START(rollerg)
+ MCFG_VIDEO_UPDATE(rollerg)
- MDRV_K053244_ADD("k053244", rollerg_k05324x_intf)
- MDRV_K051316_ADD("k051316", rollerg_k051316_intf)
+ MCFG_K053244_ADD("k053244", rollerg_k05324x_intf)
+ MCFG_K051316_ADD("k051316", rollerg_k051316_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("k053260", K053260, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index 8db825b0b56..f84954baee4 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -200,47 +200,47 @@ GFXDECODE_END
static MACHINE_CONFIG_START( rollrace, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,XTAL_24MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rollrace_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_24MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rollrace_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_24MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rollrace_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_24MHz/16) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rollrace_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(16,255,16, 255-16)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(16,255,16, 255-16)
- MDRV_GFXDECODE(rollrace)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(rollrace)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(wiz)
- MDRV_VIDEO_UPDATE(rollrace)
+ MCFG_PALETTE_INIT(wiz)
+ MCFG_VIDEO_UPDATE(rollrace)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ay1", AY8910,XTAL_24MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_SOUND_ADD("ay1", AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ay2", AY8910,XTAL_24MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_SOUND_ADD("ay2", AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("ay3", AY8910,XTAL_24MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ADD("ay3", AY8910,XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( rollace2, rollrace )
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0,255-24,16, 255-16)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0,255-24,16, 255-16)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c
index c37026e9865..78348c0937b 100644
--- a/src/mame/drivers/rotaryf.c
+++ b/src/mame/drivers/rotaryf.c
@@ -151,19 +151,19 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( rotaryf, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",I8085A,4000000) /* 8080? */ /* 2 MHz? */
- MDRV_CPU_PROGRAM_MAP(rotaryf_map)
- MDRV_CPU_IO_MAP(rotaryf_io_map)
- MDRV_CPU_VBLANK_INT_HACK(rotaryf_interrupt,5)
+ MCFG_CPU_ADD("maincpu",I8085A,4000000) /* 8080? */ /* 2 MHz? */
+ MCFG_CPU_PROGRAM_MAP(rotaryf_map)
+ MCFG_CPU_IO_MAP(rotaryf_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(rotaryf_interrupt,5)
/* video hardware */
- MDRV_VIDEO_UPDATE(rotaryf)
+ MCFG_VIDEO_UPDATE(rotaryf)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 262) /* vert size is a guess, taken from mw8080bw */
- MDRV_SCREEN_VISIBLE_AREA(1*8, 30*8-1, 0*8, 32*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 262) /* vert size is a guess, taken from mw8080bw */
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 30*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c
index 23df24ffec0..db1efffd440 100644
--- a/src/mame/drivers/roul.c
+++ b/src/mame/drivers/roul.c
@@ -243,35 +243,35 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( roul, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(roul_map)
- MDRV_CPU_IO_MAP(roul_cpu_io_map)
- MDRV_CPU_VBLANK_INT("screen",nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(roul_map)
+ MCFG_CPU_IO_MAP(roul_cpu_io_map)
+ MCFG_CPU_VBLANK_INT("screen",nmi_line_pulse)
- MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_cpu_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_cpu_io_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PALETTE_INIT(roul)
+ MCFG_PALETTE_INIT(roul)
/* video hardware */
- 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, 0*8, 32*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, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(roul)
- MDRV_VIDEO_UPDATE(roul)
+ MCFG_VIDEO_START(roul)
+ MCFG_VIDEO_UPDATE(roul)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 1000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START(roul)
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index b242fc84e4a..5d790ab6a9c 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -601,88 +601,88 @@ static const sn76477_interface sn76477_intf =
static MACHINE_CONFIG_START( route16, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(route16_cpu1_map)
- MDRV_CPU_IO_MAP(cpu1_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
+ MCFG_CPU_PROGRAM_MAP(route16_cpu1_map)
+ MCFG_CPU_IO_MAP(cpu1_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("cpu2", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(route16_cpu2_map)
+ MCFG_CPU_ADD("cpu2", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
+ MCFG_CPU_PROGRAM_MAP(route16_cpu2_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(route16)
+ MCFG_VIDEO_UPDATE(route16)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) /* frames per second, vblank duration */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) /* frames per second, vblank duration */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, 10000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay8910", AY8910, 10000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( routex, route16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(routex_cpu1_map)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_PROGRAM_MAP(routex_cpu1_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( stratvox, route16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(stratvox_cpu1_map)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_PROGRAM_MAP(stratvox_cpu1_map)
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_PROGRAM_MAP(stratvox_cpu2_map)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_PROGRAM_MAP(stratvox_cpu2_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(stratvox)
+ MCFG_VIDEO_UPDATE(stratvox)
/* sound hardware */
- MDRV_SOUND_MODIFY("ay8910")
- MDRV_SOUND_CONFIG(stratvox_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_MODIFY("ay8910")
+ MCFG_SOUND_CONFIG(stratvox_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(sn76477_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(sn76477_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- 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
static MACHINE_CONFIG_DERIVED( speakres, stratvox )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(speakres_cpu1_map)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_PROGRAM_MAP(speakres_cpu1_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spacecho, speakres )
/* basic machine hardware */
- MDRV_CPU_MODIFY("cpu2")
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,48)
+ MCFG_CPU_MODIFY("cpu2")
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,48)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ttmahjng, route16 )
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(ttmahjng_cpu1_map)
- MDRV_CPU_IO_MAP(0)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_PROGRAM_MAP(ttmahjng_cpu1_map)
+ MCFG_CPU_IO_MAP(0)
/* video hardware */
- MDRV_VIDEO_UPDATE(ttmahjng)
+ MCFG_VIDEO_UPDATE(ttmahjng)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index fffc27108e8..9e440d26317 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -3119,86 +3119,86 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( royalmah, royalmah_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(royalmah_map)
- MDRV_CPU_IO_MAP(royalmah_iomap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(royalmah_map)
+ MCFG_CPU_IO_MAP(royalmah_iomap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_UPDATE(royalmah)
- MDRV_PALETTE_LENGTH(16*2)
- MDRV_PALETTE_INIT(royalmah)
+ MCFG_VIDEO_UPDATE(royalmah)
+ MCFG_PALETTE_LENGTH(16*2)
+ MCFG_PALETTE_INIT(royalmah)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 247)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 247)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 18432000/12)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("aysnd", AY8910, 18432000/12)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( janoh, royalmah )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(janho_map)
-
- MDRV_CPU_ADD("sub", Z80, 4000000) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(janoh_sub_map)
- MDRV_CPU_IO_MAP(janoh_sub_iomap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(janho_map)
+
+ MCFG_CPU_ADD("sub", Z80, 4000000) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(janoh_sub_map)
+ MCFG_CPU_IO_MAP(janoh_sub_iomap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jansou, royalmah )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jansou_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(jansou_map)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4.000 MHz */
- MDRV_CPU_PROGRAM_MAP(jansou_sub_map)
- MDRV_CPU_IO_MAP(jansou_sub_iomap)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,4000000/512)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(jansou_sub_map)
+ MCFG_CPU_IO_MAP(jansou_sub_iomap)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,4000000/512)
- 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
static MACHINE_CONFIG_DERIVED( dondenmj, royalmah )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MDRV_CPU_IO_MAP(dondenmj_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_CPU_IO_MAP(dondenmj_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( makaijan, royalmah )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MDRV_CPU_IO_MAP(makaijan_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_CPU_IO_MAP(makaijan_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( daisyari, royalmah )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MDRV_CPU_IO_MAP(daisyari_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_CPU_IO_MAP(daisyari_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjclub, royalmah )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MDRV_CPU_IO_MAP(mjclub_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_CPU_IO_MAP(mjclub_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ippatsu, dondenmj )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(ippatsu_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(ippatsu_iomap)
MACHINE_CONFIG_END
static INTERRUPT_GEN( suzume_irq )
@@ -3208,39 +3208,39 @@ static INTERRUPT_GEN( suzume_irq )
}
static MACHINE_CONFIG_DERIVED( suzume, dondenmj )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(suzume_iomap)
- MDRV_CPU_VBLANK_INT("screen", suzume_irq)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(suzume_iomap)
+ MCFG_CPU_VBLANK_INT("screen", suzume_irq)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tontonb, dondenmj )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(tontonb_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(tontonb_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjdiplob, dondenmj )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjdiplob_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(mjdiplob_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( majs101b, dondenmj )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(majs101b_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(majs101b_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjapinky, dondenmj )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjapinky_map)
- MDRV_CPU_IO_MAP(mjapinky_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjapinky_map)
+ MCFG_CPU_IO_MAP(mjapinky_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjderngr, dondenmj )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mjderngr_iomap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(mjderngr_iomap)
/* video hardware */
- MDRV_PALETTE_LENGTH(16*32)
- MDRV_PALETTE_INIT(mjderngr)
+ MCFG_PALETTE_LENGTH(16*32)
+ MCFG_PALETTE_INIT(mjderngr)
MACHINE_CONFIG_END
/* It runs in IM 2, thus needs a vector on the data bus */
@@ -3255,38 +3255,38 @@ static INTERRUPT_GEN( janptr96_interrupt )
}
static MACHINE_CONFIG_DERIVED( janptr96, mjderngr )
- MDRV_CPU_REPLACE("maincpu",Z80,XTAL_16MHz/2) /* 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(janptr96_map)
- MDRV_CPU_IO_MAP(janptr96_iomap)
- MDRV_CPU_VBLANK_INT_HACK(janptr96_interrupt,3) /* IM 2 needs a vector on the data bus */
+ MCFG_CPU_REPLACE("maincpu",Z80,XTAL_16MHz/2) /* 8 MHz? */
+ MCFG_CPU_PROGRAM_MAP(janptr96_map)
+ MCFG_CPU_IO_MAP(janptr96_iomap)
+ MCFG_CPU_VBLANK_INT_HACK(janptr96_interrupt,3) /* IM 2 needs a vector on the data bus */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 9, 255-8)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 9, 255-8)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjifb, mjderngr )
- MDRV_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(mjifb_map)
- MDRV_CPU_IO_MAP(mjifb_iomap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(mjifb_map)
+ MCFG_CPU_IO_MAP(mjifb_iomap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjdejavu, mjderngr )
- MDRV_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(mjdejavu_map)
- MDRV_CPU_IO_MAP(mjifb_iomap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(mjdejavu_map)
+ MCFG_CPU_IO_MAP(mjifb_iomap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
MACHINE_CONFIG_END
@@ -3300,42 +3300,42 @@ static INTERRUPT_GEN( mjtensin_interrupt )
}
static MACHINE_CONFIG_DERIVED( mjtensin, mjderngr )
- MDRV_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(mjtensin_map)
- MDRV_CPU_IO_MAP(mjtensin_iomap)
- MDRV_CPU_VBLANK_INT_HACK( mjtensin_interrupt,2 )
+ MCFG_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(mjtensin_map)
+ MCFG_CPU_IO_MAP(mjtensin_iomap)
+ MCFG_CPU_VBLANK_INT_HACK( mjtensin_interrupt,2 )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cafetime, mjderngr )
- MDRV_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(cafetime_map)
- MDRV_CPU_IO_MAP(cafetime_iomap)
- MDRV_CPU_VBLANK_INT_HACK(mjtensin_interrupt,2)
+ MCFG_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(cafetime_map)
+ MCFG_CPU_IO_MAP(cafetime_iomap)
+ MCFG_CPU_VBLANK_INT_HACK(mjtensin_interrupt,2)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjvegasa, mjderngr )
- MDRV_CPU_REPLACE("maincpu",TMP90841, XTAL_8MHz) /* ? */
- MDRV_CPU_PROGRAM_MAP(mjvegasa_map)
- MDRV_CPU_IO_MAP(mjvegasa_iomap)
- MDRV_CPU_VBLANK_INT_HACK(mjtensin_interrupt,2)
+ MCFG_CPU_REPLACE("maincpu",TMP90841, XTAL_8MHz) /* ? */
+ MCFG_CPU_PROGRAM_MAP(mjvegasa_map)
+ MCFG_CPU_IO_MAP(mjvegasa_iomap)
+ MCFG_CPU_VBLANK_INT_HACK(mjtensin_interrupt,2)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 53bb2511e50..f5bcdf71cdd 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -467,37 +467,37 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( rpunch, rpunch_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_RESET(rpunch)
+ MCFG_MACHINE_RESET(rpunch)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(304, 224)
- MDRV_SCREEN_VISIBLE_AREA(8, 303-8, 0, 223-8)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(304, 224)
+ MCFG_SCREEN_VISIBLE_AREA(8, 303-8, 0, 223-8)
- MDRV_GFXDECODE(rpunch)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(rpunch)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(rpunch)
- MDRV_VIDEO_UPDATE(rpunch)
+ MCFG_VIDEO_START(rpunch)
+ MCFG_VIDEO_UPDATE(rpunch)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index cc62ceadbdc..6a2b111f033 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -348,37 +348,37 @@ static const pokey_interface pokey_interface_2 =
static MACHINE_CONFIG_START( runaway, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 12096000 / 8) /* ? */
- MDRV_CPU_PROGRAM_MAP(runaway_map)
+ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 8) /* ? */
+ MCFG_CPU_PROGRAM_MAP(runaway_map)
- MDRV_MACHINE_START(runaway)
- MDRV_MACHINE_RESET(runaway)
+ MCFG_MACHINE_START(runaway)
+ MCFG_MACHINE_RESET(runaway)
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 263)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 263)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
- MDRV_GFXDECODE(runaway)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(runaway)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(runaway)
- MDRV_VIDEO_UPDATE(runaway)
+ MCFG_VIDEO_START(runaway)
+ MCFG_VIDEO_UPDATE(runaway)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, 12096000 / 8)
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, 12096000 / 8)
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, 12096000 / 8)
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, 12096000 / 8)
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -387,10 +387,10 @@ static MACHINE_CONFIG_DERIVED( qwak, runaway )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(qwak)
+ MCFG_GFXDECODE(qwak)
- MDRV_VIDEO_START(qwak)
- MDRV_VIDEO_UPDATE(qwak)
+ MCFG_VIDEO_START(qwak)
+ MCFG_VIDEO_UPDATE(qwak)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index a4f89afb4df..5fd0278eb67 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -396,54 +396,54 @@ static MACHINE_RESET( rng )
static MACHINE_CONFIG_START( rng, rungun_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(rungun_map)
- MDRV_CPU_VBLANK_INT("screen", rng_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(rungun_map)
+ MCFG_CPU_VBLANK_INT("screen", rng_interrupt)
- MDRV_CPU_ADD("soundcpu", Z80, 10000000) // 8Mhz (10Mhz is much safer in self-test due to heavy sync)
- MDRV_CPU_PROGRAM_MAP(rungun_sound_map)
- MDRV_CPU_PERIODIC_INT(audio_interrupt, 480)
+ MCFG_CPU_ADD("soundcpu", Z80, 10000000) // 8Mhz (10Mhz is much safer in self-test due to heavy sync)
+ MCFG_CPU_PROGRAM_MAP(rungun_sound_map)
+ MCFG_CPU_PERIODIC_INT(audio_interrupt, 480)
- MDRV_QUANTUM_TIME(HZ(6000)) // higher if sound stutters
+ MCFG_QUANTUM_TIME(HZ(6000)) // higher if sound stutters
- MDRV_GFXDECODE(rungun)
+ MCFG_GFXDECODE(rungun)
- MDRV_MACHINE_START(rng)
- MDRV_MACHINE_RESET(rng)
+ MCFG_MACHINE_START(rng)
+ MCFG_MACHINE_RESET(rng)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
- 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(88, 88+384-1, 24, 24+224-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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(88, 88+384-1, 24, 24+224-1)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(rng)
- MDRV_VIDEO_UPDATE(rng)
+ MCFG_VIDEO_START(rng)
+ MCFG_VIDEO_UPDATE(rng)
- MDRV_K053936_ADD("k053936", rng_k053936_intf)
- MDRV_K055673_ADD("k055673", rng_k055673_intf)
- MDRV_K053252_ADD("k053252")
+ MCFG_K053936_ADD("k053936", rng_k053936_intf)
+ MCFG_K055673_ADD("k055673", rng_k055673_intf)
+ MCFG_K053252_ADD("k053252")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("k054539_1", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("k054539_1", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k054539_2", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("k054539_2", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index 7d59da2bb68..dfb09d67a39 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -295,10 +295,10 @@ static const samples_interface safarir_samples_interface =
static MACHINE_CONFIG_FRAGMENT( safarir_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(safarir_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(safarir_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -398,26 +398,26 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( safarir, safarir_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8085A, 18000000/8) /* 2.25 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", I8085A, 18000000/8) /* 2.25 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(safarir)
+ MCFG_MACHINE_START(safarir)
/* video hardware */
- MDRV_VIDEO_START(safarir)
- MDRV_VIDEO_UPDATE(safarir)
- MDRV_PALETTE_INIT(safarir)
- MDRV_PALETTE_LENGTH(2*8)
- MDRV_GFXDECODE(safarir)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 26*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_VIDEO_START(safarir)
+ MCFG_VIDEO_UPDATE(safarir)
+ MCFG_PALETTE_INIT(safarir)
+ MCFG_PALETTE_LENGTH(2*8)
+ MCFG_GFXDECODE(safarir)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 26*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
/* audio hardware */
- MDRV_FRAGMENT_ADD(safarir_audio)
+ MCFG_FRAGMENT_ADD(safarir_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 9486934eaf4..cbe90601eec 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -441,46 +441,46 @@ static const kaneko_pandora_interface sandscrp_pandora_config =
static MACHINE_CONFIG_START( sandscrp, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000N-12 */
- MDRV_CPU_PROGRAM_MAP(sandscrp)
- MDRV_CPU_VBLANK_INT("screen", sandscrp_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000N-12 */
+ MCFG_CPU_PROGRAM_MAP(sandscrp)
+ MCFG_CPU_VBLANK_INT("screen", sandscrp_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,4000000) /* Z8400AB1, Reads the DSWs: it can't be disabled */
- MDRV_CPU_PROGRAM_MAP(sandscrp_soundmem)
- MDRV_CPU_IO_MAP(sandscrp_soundport)
+ MCFG_CPU_ADD("audiocpu", Z80,4000000) /* Z8400AB1, Reads the DSWs: it can't be disabled */
+ MCFG_CPU_PROGRAM_MAP(sandscrp_soundmem)
+ MCFG_CPU_IO_MAP(sandscrp_soundport)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
- MDRV_MACHINE_RESET(sandscrp)
+ MCFG_MACHINE_RESET(sandscrp)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(sandscrp)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(sandscrp)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_KANEKO_PANDORA_ADD("pandora", sandscrp_pandora_config)
+ MCFG_KANEKO_PANDORA_ADD("pandora", sandscrp_pandora_config)
- MDRV_VIDEO_START(sandscrp_1xVIEW2)
- MDRV_VIDEO_EOF(sandscrp)
- MDRV_VIDEO_UPDATE(sandscrp)
+ MCFG_VIDEO_START(sandscrp_1xVIEW2)
+ MCFG_VIDEO_EOF(sandscrp)
+ MCFG_VIDEO_UPDATE(sandscrp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
+ MCFG_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MDRV_SOUND_ADD("ymsnd", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_intf_sandscrp)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_intf_sandscrp)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index 359ee309c64..296baccc605 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -354,66 +354,66 @@ static VIDEO_START( sangho )
static MACHINE_CONFIG_START( pzlestar, driver_device )
- MDRV_CPU_ADD("maincpu", Z80,8000000) // ?
- MDRV_CPU_PROGRAM_MAP(sangho_map)
- MDRV_CPU_IO_MAP(pzlestar_io_map)
- MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262)
+ MCFG_CPU_ADD("maincpu", Z80,8000000) // ?
+ MCFG_CPU_PROGRAM_MAP(sangho_map)
+ MCFG_CPU_IO_MAP(pzlestar_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(sangho_interrupt,262)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- 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 + 32, (212 + 28) * 2)
- MDRV_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 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 + 32, (212 + 28) * 2)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_MACHINE_RESET(pzlestar)
+ MCFG_MACHINE_RESET(pzlestar)
- MDRV_PALETTE_INIT( v9938 )
+ MCFG_PALETTE_INIT( v9938 )
- MDRV_VIDEO_START( sangho )
- MDRV_VIDEO_UPDATE( generic_bitmapped )
+ MCFG_VIDEO_START( sangho )
+ MCFG_VIDEO_UPDATE( generic_bitmapped )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3580000)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3580000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sexyboom, driver_device )
- MDRV_CPU_ADD("maincpu", Z80,8000000) // ?
- MDRV_CPU_PROGRAM_MAP(sangho_map)
- MDRV_CPU_IO_MAP(sexyboom_io_map)
- MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262)
+ MCFG_CPU_ADD("maincpu", Z80,8000000) // ?
+ MCFG_CPU_PROGRAM_MAP(sangho_map)
+ MCFG_CPU_IO_MAP(sexyboom_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(sangho_interrupt,262)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- 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 + 32, (212 + 28) * 2)
- MDRV_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 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 + 32, (212 + 28) * 2)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_MACHINE_RESET(sexyboom)
+ MCFG_MACHINE_RESET(sexyboom)
- MDRV_PALETTE_INIT( v9938 )
+ MCFG_PALETTE_INIT( v9938 )
- MDRV_VIDEO_START( sangho )
- MDRV_VIDEO_UPDATE( generic_bitmapped )
+ MCFG_VIDEO_START( sangho )
+ MCFG_VIDEO_UPDATE( generic_bitmapped )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, 3580000)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, 3580000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( pzlestar )
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 6d1e741af9e..9d501b63434 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -374,60 +374,60 @@ static INTERRUPT_GEN( sauro_interrupt )
static MACHINE_CONFIG_START( tecfri, sauro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) /* verified on pcb */
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55.72) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000)) // frames per second, vblank duration (otherwise sprites lag)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32 * 8, 32 * 8)
- MDRV_SCREEN_VISIBLE_AREA(1 * 8, 31 * 8 - 1, 2 * 8, 30 * 8 - 1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55.72) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000)) // frames per second, vblank duration (otherwise sprites lag)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32 * 8, 32 * 8)
+ MCFG_SCREEN_VISIBLE_AREA(1 * 8, 31 * 8 - 1, 2 * 8, 30 * 8 - 1)
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_20MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_20MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( trckydoc, tecfri )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(trckydoc_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(trckydoc_map)
- MDRV_GFXDECODE(trckydoc)
+ MCFG_GFXDECODE(trckydoc)
- MDRV_VIDEO_START(trckydoc)
- MDRV_VIDEO_UPDATE(trckydoc)
+ MCFG_VIDEO_START(trckydoc)
+ MCFG_VIDEO_UPDATE(trckydoc)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sauro, tecfri )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sauro_map)
- MDRV_CPU_IO_MAP(sauro_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sauro_map)
+ MCFG_CPU_IO_MAP(sauro_io_map)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) // 4 MHz?
- MDRV_CPU_PROGRAM_MAP(sauro_sound_map)
- MDRV_CPU_PERIODIC_INT(sauro_interrupt, 8*60) // ?
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) // 4 MHz?
+ MCFG_CPU_PROGRAM_MAP(sauro_sound_map)
+ MCFG_CPU_PERIODIC_INT(sauro_interrupt, 8*60) // ?
- MDRV_GFXDECODE(sauro)
+ MCFG_GFXDECODE(sauro)
- MDRV_VIDEO_START(sauro)
- MDRV_VIDEO_UPDATE(sauro)
+ MCFG_VIDEO_START(sauro)
+ MCFG_VIDEO_UPDATE(sauro)
- MDRV_SOUND_ADD("speech", SP0256, 3120000)
- MDRV_SOUND_CONFIG(sauro_sp256)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("speech", SP0256, 3120000)
+ MCFG_SOUND_CONFIG(sauro_sp256)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c
index 6db612a8fbe..868fcb4ecf1 100644
--- a/src/mame/drivers/savquest.c
+++ b/src/mame/drivers/savquest.c
@@ -55,21 +55,21 @@ static INPUT_PORTS_START( savquest )
INPUT_PORTS_END
static MACHINE_CONFIG_START( savquest, driver_device )
- MDRV_CPU_ADD("maincpu", PENTIUM, 450000000) // actually Pentium II 450
- MDRV_CPU_PROGRAM_MAP(savquest_map)
- MDRV_CPU_IO_MAP(savquest_io)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 450000000) // actually Pentium II 450
+ MCFG_CPU_PROGRAM_MAP(savquest_map)
+ MCFG_CPU_IO_MAP(savquest_io)
/* 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
- MDRV_PALETTE_LENGTH(16)
-
- MDRV_VIDEO_START(savquest)
- MDRV_VIDEO_UPDATE(savquest)
+ 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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
+ MCFG_PALETTE_LENGTH(16)
+
+ MCFG_VIDEO_START(savquest)
+ MCFG_VIDEO_UPDATE(savquest)
MACHINE_CONFIG_END
ROM_START( savquest )
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 26e0b59111e..3200f955889 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -175,41 +175,41 @@ GFXDECODE_END
static MACHINE_CONFIG_START( sbasketb, sbasketb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 1400000) /* 1.400 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sbasketb_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, 1400000) /* 1.400 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sbasketb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz / 4) /* 3.5795 MHz */
- MDRV_CPU_PROGRAM_MAP(sbasketb_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz / 4) /* 3.5795 MHz */
+ MCFG_CPU_PROGRAM_MAP(sbasketb_sound_map)
/* 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)
+ 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)
- MDRV_GFXDECODE(sbasketb)
- MDRV_PALETTE_LENGTH(16*16+16*16*16)
+ MCFG_GFXDECODE(sbasketb)
+ MCFG_PALETTE_LENGTH(16*16+16*16*16)
- MDRV_PALETTE_INIT(sbasketb)
- MDRV_VIDEO_START(sbasketb)
- MDRV_VIDEO_UPDATE(sbasketb)
+ MCFG_PALETTE_INIT(sbasketb)
+ MCFG_VIDEO_START(sbasketb)
+ MCFG_VIDEO_UPDATE(sbasketb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("snsnd", SN76489, XTAL_14_31818MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76489, XTAL_14_31818MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 2e9bf01c166..0a6577c8bc3 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -370,29 +370,29 @@ static PALETTE_INIT( sbowling )
static MACHINE_CONFIG_START( sbowling, sbowling_state )
- MDRV_CPU_ADD("maincpu", I8080, XTAL_19_968MHz/10) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(port_map)
- MDRV_CPU_VBLANK_INT_HACK(sbw_interrupt, 2)
- MDRV_GFXDECODE(sbowling)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL_19_968MHz/10) /* ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(port_map)
+ MCFG_CPU_VBLANK_INT_HACK(sbw_interrupt, 2)
+ MCFG_GFXDECODE(sbowling)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 262) /* vert size taken from mw8080bw */
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 262) /* vert size taken from mw8080bw */
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(sbowling)
- MDRV_VIDEO_START(sbowling)
- MDRV_VIDEO_UPDATE(sbowling)
+ MCFG_PALETTE_LENGTH(0x400)
+ MCFG_PALETTE_INIT(sbowling)
+ MCFG_VIDEO_START(sbowling)
+ MCFG_VIDEO_UPDATE(sbowling)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_19_968MHz/16) /* ? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_19_968MHz/16) /* ? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
ROM_START( sbowling )
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index dded0b561ad..0c94c1644a2 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -499,29 +499,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( sbrkout, sbrkout_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(sbrkout)
- MDRV_MACHINE_RESET(sbrkout)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_START(sbrkout)
+ MCFG_MACHINE_RESET(sbrkout)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
/* video hardware */
- MDRV_GFXDECODE(sbrkout)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(sbrkout)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 384, 0, 256, 262, 0, 224)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 384, 0, 256, 262, 0, 224)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(sbrkout)
- MDRV_VIDEO_UPDATE(sbrkout)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(sbrkout)
+ MCFG_VIDEO_UPDATE(sbrkout)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index 710fc312dd7..3c3b8449ca0 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -214,35 +214,35 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( sbugger, sbugger_state )
- MDRV_CPU_ADD("maincpu", I8085A, 6000000) /* 3.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(sbugger_map)
- MDRV_CPU_IO_MAP(sbugger_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq3_line_hold,NUM_INTS_FRAME)
+ MCFG_CPU_ADD("maincpu", I8085A, 6000000) /* 3.00 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(sbugger_map)
+ MCFG_CPU_IO_MAP(sbugger_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq3_line_hold,NUM_INTS_FRAME)
- MDRV_GFXDECODE(sbugger)
+ MCFG_GFXDECODE(sbugger)
- 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, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(sbugger)
- MDRV_VIDEO_START(sbugger)
- MDRV_VIDEO_UPDATE(sbugger)
+ MCFG_PALETTE_INIT(sbugger)
+ MCFG_VIDEO_START(sbugger)
+ MCFG_VIDEO_UPDATE(sbugger)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn76489.1", SN76489, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn76489.1", SN76489, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn76489.2", SN76489, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn76489.2", SN76489, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index a45ad64c8ee..0139ce313da 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -853,48 +853,48 @@ static const ay8910_interface scobra_ay8910_interface_2 =
static MACHINE_CONFIG_START( type1, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(type1_map)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(type1_map)
- MDRV_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(scobra_sound_map)
- MDRV_CPU_IO_MAP(scobra_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
+ MCFG_CPU_PROGRAM_MAP(scobra_sound_map)
+ MCFG_CPU_IO_MAP(scobra_sound_io_map)
- MDRV_7474_ADD("konami_7474", "konami_7474", NULL, scramble_sh_7474_q_callback)
+ MCFG_7474_ADD("konami_7474", "konami_7474", NULL, scramble_sh_7474_q_callback)
- MDRV_MACHINE_RESET(scramble)
+ MCFG_MACHINE_RESET(scramble)
- MDRV_PPI8255_ADD( "ppi8255_0", scramble_ppi_0_intf )
- MDRV_PPI8255_ADD( "ppi8255_1", scramble_ppi_1_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", scramble_ppi_0_intf )
+ MCFG_PPI8255_ADD( "ppi8255_1", scramble_ppi_1_intf )
- MDRV_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
- MDRV_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
+ MCFG_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
+ MCFG_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
- MDRV_TIMER_ADD("int_timer", galaxold_interrupt_timer)
+ MCFG_TIMER_ADD("int_timer", galaxold_interrupt_timer)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(16000.0/132/2)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(16000.0/132/2)
+ 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)
- MDRV_GFXDECODE(scobra)
- MDRV_PALETTE_LENGTH(32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 1 for background */
+ MCFG_GFXDECODE(scobra)
+ MCFG_PALETTE_LENGTH(32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 1 for background */
- MDRV_PALETTE_INIT(scrambold)
- MDRV_VIDEO_START(scrambold)
- MDRV_VIDEO_UPDATE(galaxold)
+ MCFG_PALETTE_INIT(scrambold)
+ MCFG_VIDEO_START(scrambold)
+ MCFG_VIDEO_UPDATE(galaxold)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 14318000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay1", AY8910, 14318000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
- MDRV_SOUND_ADD("ay2", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(scobra_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
+ MCFG_SOUND_ADD("ay2", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(scobra_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
MACHINE_CONFIG_END
@@ -906,12 +906,12 @@ static MACHINE_CONFIG_DERIVED( rescue, type1 )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_LENGTH(32+64+2+128) /* 32 for characters, 64 for stars, 2 for bullets, 128 for background */
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_PALETTE_LENGTH(32+64+2+128) /* 32 for characters, 64 for stars, 2 for bullets, 128 for background */
- MDRV_PALETTE_INIT(rescue)
- MDRV_VIDEO_START(rescue)
+ MCFG_PALETTE_INIT(rescue)
+ MCFG_VIDEO_START(rescue)
MACHINE_CONFIG_END
@@ -920,31 +920,31 @@ static MACHINE_CONFIG_DERIVED( minefld, type1 )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_LENGTH(32+64+2+256) /* 32 for characters, 64 for stars, 2 for bullets, 256 for background */
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_PALETTE_LENGTH(32+64+2+256) /* 32 for characters, 64 for stars, 2 for bullets, 256 for background */
- MDRV_PALETTE_INIT(minefld)
- MDRV_VIDEO_START(minefld)
+ MCFG_PALETTE_INIT(minefld)
+ MCFG_VIDEO_START(minefld)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mimonkey, type1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mimonkey_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mimonkey_map)
/* video hardware */
- MDRV_VIDEO_START(mimonkey)
+ MCFG_VIDEO_START(mimonkey)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( type2, type1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(type2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(type2_map)
MACHINE_CONFIG_END
@@ -953,13 +953,13 @@ static MACHINE_CONFIG_DERIVED( stratgyx, type2 )
/* basic machine hardware */
/* device config overrides */
- MDRV_PPI8255_RECONFIG( "ppi8255_1", stratgyx_ppi_1_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255_1", stratgyx_ppi_1_intf )
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+8) /* 32 for characters, 64 for stars, 2 for bullets, 8 for background */
+ MCFG_PALETTE_LENGTH(32+64+2+8) /* 32 for characters, 64 for stars, 2 for bullets, 8 for background */
- MDRV_PALETTE_INIT(stratgyx)
- MDRV_VIDEO_START(stratgyx)
+ MCFG_PALETTE_INIT(stratgyx)
+ MCFG_VIDEO_START(stratgyx)
MACHINE_CONFIG_END
@@ -968,68 +968,68 @@ static MACHINE_CONFIG_DERIVED( darkplnt, type2 )
/* basic machine hardware */
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2) /* 32 for characters, 64 (buffer) for stars, 2 for bullets */
+ MCFG_PALETTE_LENGTH(32+64+2) /* 32 for characters, 64 (buffer) for stars, 2 for bullets */
- MDRV_PALETTE_INIT(darkplnt)
- MDRV_VIDEO_START(darkplnt)
+ MCFG_PALETTE_INIT(darkplnt)
+ MCFG_VIDEO_START(darkplnt)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hustler, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(hustler_map)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(hustler_map)
- MDRV_CPU_ADD("audiocpu",Z80,14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(hustler_sound_map)
- MDRV_CPU_IO_MAP(hustler_sound_io_map)
+ MCFG_CPU_ADD("audiocpu",Z80,14318000/8) /* 1.78975 MHz */
+ MCFG_CPU_PROGRAM_MAP(hustler_sound_map)
+ MCFG_CPU_IO_MAP(hustler_sound_io_map)
- MDRV_7474_ADD("konami_7474", "konami_7474", NULL, scramble_sh_7474_q_callback)
+ MCFG_7474_ADD("konami_7474", "konami_7474", NULL, scramble_sh_7474_q_callback)
- MDRV_MACHINE_RESET(scramble)
+ MCFG_MACHINE_RESET(scramble)
- MDRV_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
- MDRV_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
+ MCFG_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
+ MCFG_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
- MDRV_TIMER_ADD("int_timer", galaxold_interrupt_timer)
+ MCFG_TIMER_ADD("int_timer", galaxold_interrupt_timer)
/* device config overrides */
- MDRV_PPI8255_ADD( "ppi8255_0", scramble_ppi_0_intf )
- MDRV_PPI8255_ADD( "ppi8255_1", scramble_ppi_1_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", scramble_ppi_0_intf )
+ MCFG_PPI8255_ADD( "ppi8255_1", scramble_ppi_1_intf )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(16000.0/132/2)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(16000.0/132/2)
+ 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)
- MDRV_GFXDECODE(scobra)
- MDRV_PALETTE_LENGTH(32+64+2) /* 32 for characters, 64 for stars, 2 for bullets */
+ MCFG_GFXDECODE(scobra)
+ MCFG_PALETTE_LENGTH(32+64+2) /* 32 for characters, 64 for stars, 2 for bullets */
- MDRV_PALETTE_INIT(galaxold)
- MDRV_VIDEO_START(scrambold)
- MDRV_VIDEO_UPDATE(galaxold)
+ MCFG_PALETTE_INIT(galaxold)
+ MCFG_VIDEO_START(scrambold)
+ MCFG_VIDEO_UPDATE(galaxold)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(hustler_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(hustler_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hustlerb, hustler )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hustlerb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hustlerb_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(hustlerb_sound_map)
- MDRV_CPU_IO_MAP(hustlerb_sound_io_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(hustlerb_sound_map)
+ MCFG_CPU_IO_MAP(hustlerb_sound_io_map)
MACHINE_CONFIG_END
@@ -1037,16 +1037,16 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( anteatg, type1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(anteatg_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(anteatg_map)
MACHINE_CONFIG_END
/* same as type1 but with a strange memory map, maybe a kind of protection */
static MACHINE_CONFIG_DERIVED( anteatgb, type1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(anteatgb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(anteatgb_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index f4195a81a20..bc494d1d0c6 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -184,34 +184,34 @@ GFXDECODE_END
static MACHINE_CONFIG_START( scotrsht, scotrsht_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(scotrsht_map)
- MDRV_CPU_VBLANK_INT("screen", scotrsht_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(scotrsht_map)
+ MCFG_CPU_VBLANK_INT("screen", scotrsht_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(scotrsht_sound_map)
- MDRV_CPU_IO_MAP(scotrsht_sound_port)
+ MCFG_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(scotrsht_sound_map)
+ MCFG_CPU_IO_MAP(scotrsht_sound_port)
/* 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)
+ 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)
- MDRV_GFXDECODE(scotrsht)
- MDRV_PALETTE_LENGTH(16*8*16+16*8*16)
+ MCFG_GFXDECODE(scotrsht)
+ MCFG_PALETTE_LENGTH(16*8*16+16*8*16)
- MDRV_PALETTE_INIT(scotrsht)
- MDRV_VIDEO_START(scotrsht)
- MDRV_VIDEO_UPDATE(scotrsht)
+ MCFG_PALETTE_INIT(scotrsht)
+ MCFG_VIDEO_START(scotrsht)
+ MCFG_VIDEO_UPDATE(scotrsht)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 623b81b8d65..c90a1c66e1d 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -1236,150 +1236,150 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_START( scramble, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(scramble_map)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(scramble_map)
- MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(scramble_sound_map)
- MDRV_CPU_IO_MAP(scramble_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
+ MCFG_CPU_PROGRAM_MAP(scramble_sound_map)
+ MCFG_CPU_IO_MAP(scramble_sound_io_map)
- MDRV_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
- MDRV_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
+ MCFG_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
+ MCFG_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
- MDRV_7474_ADD("konami_7474", "konami_7474", NULL, scramble_sh_7474_q_callback)
+ MCFG_7474_ADD("konami_7474", "konami_7474", NULL, scramble_sh_7474_q_callback)
- MDRV_TIMER_ADD("int_timer", galaxold_interrupt_timer)
+ MCFG_TIMER_ADD("int_timer", galaxold_interrupt_timer)
- MDRV_MACHINE_RESET(scramble)
+ MCFG_MACHINE_RESET(scramble)
- MDRV_PPI8255_ADD( "ppi8255_0", scramble_ppi_0_intf )
- MDRV_PPI8255_ADD( "ppi8255_1", scramble_ppi_1_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", scramble_ppi_0_intf )
+ MCFG_PPI8255_ADD( "ppi8255_1", scramble_ppi_1_intf )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(16000.0/132/2)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(16000.0/132/2)
+ 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)
- MDRV_GFXDECODE(scramble)
- MDRV_PALETTE_LENGTH(32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_GFXDECODE(scramble)
+ MCFG_PALETTE_LENGTH(32+64+2+1) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(scrambold)
- MDRV_VIDEO_START(scrambold)
- MDRV_VIDEO_UPDATE(galaxold)
+ MCFG_PALETTE_INIT(scrambold)
+ MCFG_VIDEO_START(scrambold)
+ MCFG_VIDEO_UPDATE(galaxold)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("8910.1", AY8910, 14318000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("8910.1", AY8910, 14318000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
- MDRV_SOUND_ADD("8910.2", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(scramble_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
+ MCFG_SOUND_ADD("8910.2", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(scramble_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mars, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mars_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mars_map)
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(galaxold)
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_PALETTE_INIT(galaxold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( devilfsh, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mars_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mars_map)
/* video hardware */
- MDRV_GFXDECODE(devilfsh)
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(galaxold)
+ MCFG_GFXDECODE(devilfsh)
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_PALETTE_INIT(galaxold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( newsin7, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(newsin7_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(newsin7_map)
/* video hardware */
- MDRV_GFXDECODE(newsin7)
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(galaxold)
- MDRV_VIDEO_START(newsin7)
+ MCFG_GFXDECODE(newsin7)
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_PALETTE_INIT(galaxold)
+ MCFG_VIDEO_START(newsin7)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mrkougar, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mrkougar_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mrkougar_map)
- MDRV_PPI8255_RECONFIG( "ppi8255_1", mrkougar_ppi_1_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255_1", mrkougar_ppi_1_intf )
/* video hardware */
- MDRV_GFXDECODE(mrkougar)
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(galaxold)
+ MCFG_GFXDECODE(mrkougar)
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_PALETTE_INIT(galaxold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mrkougb, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mrkougar_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mrkougar_map)
- MDRV_PPI8255_RECONFIG( "ppi8255_1", mrkougar_ppi_1_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255_1", mrkougar_ppi_1_intf )
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(galaxold)
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_PALETTE_INIT(galaxold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ckongs, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ckongs_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ckongs_map)
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(galaxold)
- MDRV_VIDEO_START(ckongs)
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_PALETTE_INIT(galaxold)
+ MCFG_VIDEO_START(ckongs)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hotshock, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hotshock_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hotshock_map)
- MDRV_DEVICE_REMOVE( "ppi8255_0" )
- MDRV_DEVICE_REMOVE( "ppi8255_1" )
+ MCFG_DEVICE_REMOVE( "ppi8255_0" )
+ MCFG_DEVICE_REMOVE( "ppi8255_1" )
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_IO_MAP(hotshock_sound_io_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_IO_MAP(hotshock_sound_io_map)
- MDRV_MACHINE_RESET(galaxold)
+ MCFG_MACHINE_RESET(galaxold)
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(galaxold)
- MDRV_VIDEO_START(pisces)
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_PALETTE_INIT(galaxold)
+ MCFG_VIDEO_START(pisces)
- MDRV_SOUND_MODIFY("8910.1")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_MODIFY("8910.1")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MDRV_SOUND_MODIFY("8910.2")
- MDRV_SOUND_CONFIG(hotshock_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_MODIFY("8910.2")
+ MCFG_SOUND_CONFIG(hotshock_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cavelon, scramble )
@@ -1387,42 +1387,42 @@ static MACHINE_CONFIG_DERIVED( cavelon, scramble )
/* basic machine hardware */
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
- MDRV_PALETTE_INIT(galaxold)
- MDRV_VIDEO_START(ckongs)
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets, 0/1 for background */
+ MCFG_PALETTE_INIT(galaxold)
+ MCFG_VIDEO_START(ckongs)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mimonscr, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mimonscr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mimonscr_map)
/* video hardware */
- MDRV_VIDEO_START(mimonkey)
+ MCFG_VIDEO_START(mimonkey)
MACHINE_CONFIG_END
/* Triple Punch and Mariner are different - only one CPU, one 8910 */
static MACHINE_CONFIG_DERIVED( triplep, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(triplep_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(triplep_io_map)
- MDRV_DEVICE_REMOVE("audiocpu")
+ MCFG_DEVICE_REMOVE("audiocpu")
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets */
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets */
- MDRV_PALETTE_INIT(galaxold)
+ MCFG_PALETTE_INIT(galaxold)
/* sound hardware */
- MDRV_SOUND_MODIFY("8910.1")
- MDRV_SOUND_CLOCK(18432000/12) // triple punch/knock out ay clock is 1.535MHz, derived from main cpu xtal; verified on hardware
- MDRV_SOUND_CONFIG(triplep_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_MODIFY("8910.1")
+ MCFG_SOUND_CLOCK(18432000/12) // triple punch/knock out ay clock is 1.535MHz, derived from main cpu xtal; verified on hardware
+ MCFG_SOUND_CONFIG(triplep_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_DEVICE_REMOVE("8910.2")
+ MCFG_DEVICE_REMOVE("8910.2")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mariner, triplep )
@@ -1430,78 +1430,78 @@ static MACHINE_CONFIG_DERIVED( mariner, triplep )
/* basic machine hardware */
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+16) /* 32 for characters, 64 for stars, 2 for bullets, 16 for background */
+ MCFG_PALETTE_LENGTH(32+64+2+16) /* 32 for characters, 64 for stars, 2 for bullets, 16 for background */
- MDRV_PALETTE_INIT(mariner)
- MDRV_VIDEO_START(mariner)
+ MCFG_PALETTE_INIT(mariner)
+ MCFG_VIDEO_START(mariner)
MACHINE_CONFIG_END
/* Hunchback replaces the Z80 with a S2650 CPU */
static MACHINE_CONFIG_DERIVED( hunchbks, scramble )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", S2650, 18432000/6)
- MDRV_CPU_PROGRAM_MAP(hunchbks_map)
- MDRV_CPU_IO_MAP(hunchbks_readport)
- MDRV_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
+ MCFG_CPU_REPLACE("maincpu", S2650, 18432000/6)
+ MCFG_CPU_PROGRAM_MAP(hunchbks_map)
+ MCFG_CPU_IO_MAP(hunchbks_readport)
+ MCFG_CPU_VBLANK_INT("screen", hunchbks_vh_interrupt)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
/* video hardware */
- MDRV_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets */
+ MCFG_PALETTE_LENGTH(32+64+2+0) /* 32 for characters, 64 for stars, 2 for bullets */
- MDRV_PALETTE_INIT(galaxold)
+ MCFG_PALETTE_INIT(galaxold)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hncholms, hunchbks )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(18432000/6/2/2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(18432000/6/2/2)
- MDRV_VIDEO_START(scorpion)
+ MCFG_VIDEO_START(scorpion)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ad2083, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(ad2083_map)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(ad2083_map)
- MDRV_7474_ADD("konami_7474", "konami_7474", NULL, scramble_sh_7474_q_callback)
- MDRV_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
- MDRV_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
+ MCFG_7474_ADD("konami_7474", "konami_7474", NULL, scramble_sh_7474_q_callback)
+ MCFG_7474_ADD("7474_9m_1", "7474_9m_1", galaxold_7474_9m_1_callback, NULL)
+ MCFG_7474_ADD("7474_9m_2", "7474_9m_1", NULL, galaxold_7474_9m_2_q_callback)
- MDRV_TIMER_ADD("int_timer", galaxold_interrupt_timer)
+ MCFG_TIMER_ADD("int_timer", galaxold_interrupt_timer)
- MDRV_MACHINE_RESET(galaxold)
+ MCFG_MACHINE_RESET(galaxold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(16000.0/132/2)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(16000.0/132/2)
+ 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)
- MDRV_GFXDECODE(ad2083)
- MDRV_PALETTE_LENGTH(32+64+2+8) /* 32 for characters, 64 for stars, 2 for bullets, 8 for background */
+ MCFG_GFXDECODE(ad2083)
+ MCFG_PALETTE_LENGTH(32+64+2+8) /* 32 for characters, 64 for stars, 2 for bullets, 8 for background */
- MDRV_PALETTE_INIT(turtles)
- MDRV_VIDEO_START(ad2083)
- MDRV_VIDEO_UPDATE(galaxold)
+ MCFG_PALETTE_INIT(turtles)
+ MCFG_VIDEO_START(ad2083)
+ MCFG_VIDEO_UPDATE(galaxold)
/* sound hardware */
- MDRV_FRAGMENT_ADD(ad2083_audio)
+ MCFG_FRAGMENT_ADD(ad2083_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( turpins, scramble )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(turpins_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(turpins_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index 4782f7f05cd..181cddc3ec6 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -229,72 +229,72 @@ static MACHINE_RESET( scregg )
static MACHINE_CONFIG_START( dommy, btime_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(dommy_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,16*60) //???
+ MCFG_CPU_ADD("maincpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(dommy_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,16*60) //???
- MDRV_MACHINE_START(scregg)
- MDRV_MACHINE_RESET(scregg)
+ MCFG_MACHINE_START(scregg)
+ MCFG_MACHINE_RESET(scregg)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3072) /* frames per second, vblank duration taken from Burger Time */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3072) /* frames per second, vblank duration taken from Burger Time */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(scregg)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_GFXDECODE(scregg)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(btime)
- MDRV_VIDEO_START(btime)
- MDRV_VIDEO_UPDATE(eggs)
+ MCFG_PALETTE_INIT(btime)
+ MCFG_VIDEO_START(btime)
+ MCFG_VIDEO_UPDATE(eggs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( scregg, btime_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(eggs_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,16*60) //???
+ MCFG_CPU_ADD("maincpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(eggs_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,16*60) //???
- MDRV_MACHINE_START(scregg)
- MDRV_MACHINE_RESET(scregg)
+ MCFG_MACHINE_START(scregg)
+ MCFG_MACHINE_RESET(scregg)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3072) /* frames per second, vblank duration taken from Burger Time */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3072) /* frames per second, vblank duration taken from Burger Time */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(scregg)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_GFXDECODE(scregg)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(btime)
- MDRV_VIDEO_START(btime)
- MDRV_VIDEO_UPDATE(eggs)
+ MCFG_PALETTE_INIT(btime)
+ MCFG_VIDEO_START(btime)
+ MCFG_VIDEO_UPDATE(eggs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 9e708a4539a..161a1dc6e62 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -456,77 +456,77 @@ GFXDECODE_END
static MACHINE_CONFIG_START( sderby, sderby_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(sderby_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
-
- MDRV_NVRAM_ADD_0FILL("nvram")
-
- 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(4*8, 44*8-1, 3*8, 33*8-1)
-
- MDRV_GFXDECODE(sderby)
- MDRV_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(sderby)
- MDRV_VIDEO_UPDATE(sderby)
-
- MDRV_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_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(sderby_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
+
+ MCFG_NVRAM_ADD_0FILL("nvram")
+
+ 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(4*8, 44*8-1, 3*8, 33*8-1)
+
+ MCFG_GFXDECODE(sderby)
+ MCFG_PALETTE_LENGTH(0x1000)
+ MCFG_VIDEO_START(sderby)
+ MCFG_VIDEO_UPDATE(sderby)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ 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( spacewin, sderby_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(spacewin_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(spacewin_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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(4*8, 44*8-1, 3*8, 33*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(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(4*8, 44*8-1, 3*8, 33*8-1)
- MDRV_GFXDECODE(sderby)
- MDRV_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(sderby)
- MDRV_VIDEO_UPDATE(pmroulet)
+ MCFG_GFXDECODE(sderby)
+ MCFG_PALETTE_LENGTH(0x1000)
+ MCFG_VIDEO_START(sderby)
+ MCFG_VIDEO_UPDATE(pmroulet)
- MDRV_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_SPEAKER_STANDARD_MONO("mono")
+ 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( pmroulet, sderby_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(roulette_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(roulette_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(4*8, 44*8-1, 3*8, 33*8-1)
+ 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, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(4*8, 44*8-1, 3*8, 33*8-1)
- MDRV_GFXDECODE(sderby)
- MDRV_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(sderby)
- MDRV_VIDEO_UPDATE(pmroulet)
+ MCFG_GFXDECODE(sderby)
+ MCFG_PALETTE_LENGTH(0x1000)
+ MCFG_VIDEO_START(sderby)
+ MCFG_VIDEO_UPDATE(pmroulet)
- MDRV_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_SPEAKER_STANDARD_MONO("mono")
+ 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/seattle.c b/src/mame/drivers/seattle.c
index 7104abf4398..a06e186960c 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -2474,84 +2474,84 @@ static const mips3_config r5000_config =
static MACHINE_CONFIG_START( seattle_common, seattle_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3)
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(seattle_map)
+ MCFG_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3)
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(seattle_map)
- MDRV_MACHINE_START(seattle)
- MDRV_MACHINE_RESET(seattle)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(seattle)
+ MCFG_MACHINE_RESET(seattle)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
- MDRV_IDE_BUS_MASTER_SPACE("maincpu", PROGRAM)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_IDE_BUS_MASTER_SPACE("maincpu", PROGRAM)
- MDRV_3DFX_VOODOO_1_ADD("voodoo", STD_VOODOO_1_CLOCK, 2, "screen")
- MDRV_3DFX_VOODOO_CPU("maincpu")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4)
- MDRV_3DFX_VOODOO_VBLANK(vblank_assert)
- MDRV_3DFX_VOODOO_STALL(voodoo_stall)
+ MCFG_3DFX_VOODOO_1_ADD("voodoo", STD_VOODOO_1_CLOCK, 2, "screen")
+ MCFG_3DFX_VOODOO_CPU("maincpu")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 4)
+ MCFG_3DFX_VOODOO_VBLANK(vblank_assert)
+ MCFG_3DFX_VOODOO_STALL(voodoo_stall)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_VIDEO_UPDATE(seattle)
+ MCFG_VIDEO_UPDATE(seattle)
/* sound hardware */
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( phoenixsa, seattle_common )
- MDRV_FRAGMENT_ADD(dcs2_audio_2115)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2115)
- MDRV_CPU_REPLACE("maincpu", R4700LE, SYSTEM_CLOCK*2)
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(seattle_map)
+ MCFG_CPU_REPLACE("maincpu", R4700LE, SYSTEM_CLOCK*2)
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(seattle_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( seattle150, seattle_common )
- MDRV_FRAGMENT_ADD(dcs2_audio_2115)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2115)
- MDRV_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*3)
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(seattle_map)
+ MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*3)
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(seattle_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( seattle150_widget, seattle150 )
- MDRV_SMC91C94_ADD("ethernet", ethernet_interrupt)
+ MCFG_SMC91C94_ADD("ethernet", ethernet_interrupt)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( seattle200, seattle_common )
- MDRV_FRAGMENT_ADD(dcs2_audio_2115)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2115)
- MDRV_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4)
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(seattle_map)
+ MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4)
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(seattle_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( seattle200_widget, seattle200 )
- MDRV_SMC91C94_ADD("ethernet", ethernet_interrupt)
+ MCFG_SMC91C94_ADD("ethernet", ethernet_interrupt)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( flagstaff, seattle_common )
- MDRV_FRAGMENT_ADD(cage_seattle)
+ MCFG_FRAGMENT_ADD(cage_seattle)
- MDRV_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4)
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(seattle_map)
+ MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4)
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(seattle_map)
- MDRV_SMC91C94_ADD("ethernet", ethernet_interrupt)
+ MCFG_SMC91C94_ADD("ethernet", ethernet_interrupt)
- MDRV_3DFX_VOODOO_MODIFY("voodoo")
- MDRV_3DFX_VOODOO_TMU_MEMORY(1, 4)
+ MCFG_3DFX_VOODOO_MODIFY("voodoo")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(1, 4)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 8f74d70cab5..c0447261ab4 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -1365,41 +1365,41 @@ static VIDEO_UPDATE(segac2_new)
static MACHINE_CONFIG_START( segac, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XL2_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, XL2_CLOCK/6)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(segac2)
- MDRV_MACHINE_RESET(segac2)
- MDRV_NVRAM_ADD_RANDOM_FILL("nvram")
+ MCFG_MACHINE_START(segac2)
+ MCFG_MACHINE_RESET(segac2)
+ MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
- MDRV_FRAGMENT_ADD(megadriv_timers)
+ MCFG_FRAGMENT_ADD(megadriv_timers)
/* video hardware */
- //MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
+ //MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
- MDRV_SCREEN_ADD("megadriv", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
+ MCFG_SCREEN_ADD("megadriv", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(segac2_new)
- MDRV_VIDEO_UPDATE(segac2_new)
- MDRV_VIDEO_EOF( megadriv )
+ MCFG_VIDEO_START(segac2_new)
+ MCFG_VIDEO_UPDATE(segac2_new)
+ MCFG_VIDEO_EOF( megadriv )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3438, XL2_CLOCK/7)
- MDRV_SOUND_CONFIG(ym3438_intf)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3438, XL2_CLOCK/7)
+ MCFG_SOUND_CONFIG(ym3438_intf)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
/* right channel not connected */
- MDRV_SOUND_ADD("snsnd", SN76496, XL2_CLOCK/15)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("snsnd", SN76496, XL2_CLOCK/15)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1408,8 +1408,8 @@ static MACHINE_CONFIG_DERIVED( segac2, segac )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_ADD("upd", UPD7759, XL1_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("upd", UPD7759, XL1_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index ce743a872da..4c6ea835b75 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -866,37 +866,37 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_CONFIG_START( systeme, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, 10738600/2) /* correct? */
- MDRV_CPU_PROGRAM_MAP(systeme_map)
- MDRV_CPU_IO_MAP(io_map)
+ MCFG_CPU_ADD("maincpu", Z80, 10738600/2) /* correct? */
+ MCFG_CPU_PROGRAM_MAP(systeme_map)
+ MCFG_CPU_IO_MAP(io_map)
/* IRQ handled via the timers */
- MDRV_MACHINE_RESET(systeme)
+ MCFG_MACHINE_RESET(systeme)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_SCREEN_SIZE(256, 256)
-// MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 223)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 191)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_SIZE(256, 256)
+// MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 223)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 191)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(sms)
- MDRV_VIDEO_UPDATE(systeme) /* Copies a bitmap */
- MDRV_VIDEO_EOF(systeme) /* Used to Sync the timing */
+ MCFG_VIDEO_START(sms)
+ MCFG_VIDEO_UPDATE(systeme) /* Copies a bitmap */
+ MCFG_VIDEO_EOF(systeme) /* Used to Sync the timing */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 3579540)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76496, 3579540)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76496, 3579540)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76496, 3579540)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index 08afa941749..b5fefe4cd4d 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -832,26 +832,26 @@ GFXDECODE_END
static MACHINE_CONFIG_START( g80r_base, segag80r_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", segag80r_vblank_start)
+ MCFG_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", segag80r_vblank_start)
- MDRV_MACHINE_START(g80r)
+ MCFG_MACHINE_START(g80r)
/* video hardware */
- MDRV_GFXDECODE(segag80r)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(segag80r)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_VIDEO_START(segag80r)
- MDRV_VIDEO_UPDATE(segag80r)
+ MCFG_VIDEO_START(segag80r)
+ MCFG_VIDEO_UPDATE(segag80r)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
@@ -860,8 +860,8 @@ static MACHINE_CONFIG_DERIVED( astrob, g80r_base )
/* basic machine hardware */
/* sound boards */
- MDRV_FRAGMENT_ADD(astrob_sound_board)
- MDRV_FRAGMENT_ADD(sega_speech_board)
+ MCFG_FRAGMENT_ADD(astrob_sound_board)
+ MCFG_FRAGMENT_ADD(sega_speech_board)
MACHINE_CONFIG_END
@@ -869,11 +869,11 @@ static MACHINE_CONFIG_DERIVED( 005, g80r_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(main_ppi8255_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(main_ppi8255_portmap)
/* sound boards */
- MDRV_FRAGMENT_ADD(005_sound_board)
+ MCFG_FRAGMENT_ADD(005_sound_board)
MACHINE_CONFIG_END
@@ -882,14 +882,14 @@ static MACHINE_CONFIG_DERIVED( spaceod, g80r_base )
/* basic machine hardware */
/* background board changes */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(spaceod)
- MDRV_PALETTE_LENGTH(64+64)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_GFXDECODE(spaceod)
+ MCFG_PALETTE_LENGTH(64+64)
/* sound boards */
- MDRV_FRAGMENT_ADD(spaceod_sound_board)
+ MCFG_FRAGMENT_ADD(spaceod_sound_board)
MACHINE_CONFIG_END
@@ -897,15 +897,15 @@ static MACHINE_CONFIG_DERIVED( monsterb, g80r_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(main_ppi8255_portmap)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(main_ppi8255_portmap)
/* background board changes */
- MDRV_GFXDECODE(monsterb)
- MDRV_PALETTE_LENGTH(64+64)
+ MCFG_GFXDECODE(monsterb)
+ MCFG_PALETTE_LENGTH(64+64)
/* sound boards */
- MDRV_FRAGMENT_ADD(monsterb_sound_board)
+ MCFG_FRAGMENT_ADD(monsterb_sound_board)
MACHINE_CONFIG_END
@@ -914,40 +914,40 @@ static MACHINE_CONFIG_DERIVED( pignewt, g80r_base )
/* basic machine hardware */
/* background board changes */
- MDRV_GFXDECODE(monsterb)
- MDRV_PALETTE_LENGTH(64+64)
+ MCFG_GFXDECODE(monsterb)
+ MCFG_PALETTE_LENGTH(64+64)
/* sound boards */
- MDRV_MACHINE_RESET(pignewt)
- MDRV_FRAGMENT_ADD(sega_universal_sound_board)
+ MCFG_MACHINE_RESET(pignewt)
+ MCFG_FRAGMENT_ADD(sega_universal_sound_board)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sindbadm, g80r_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(sindbadm_portmap)
- MDRV_CPU_VBLANK_INT("screen", sindbadm_vblank_start)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(sindbadm_portmap)
+ MCFG_CPU_VBLANK_INT("screen", sindbadm_vblank_start)
- MDRV_PPI8255_ADD( "ppi8255", sindbadm_ppi_intf )
+ MCFG_PPI8255_ADD( "ppi8255", sindbadm_ppi_intf )
/* video hardware */
- MDRV_GFXDECODE(monsterb)
- MDRV_PALETTE_LENGTH(64+64)
+ MCFG_GFXDECODE(monsterb)
+ MCFG_PALETTE_LENGTH(64+64)
/* sound boards */
- MDRV_CPU_ADD("audiocpu", Z80, SINDBADM_SOUND_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(sindbadm_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
+ MCFG_CPU_ADD("audiocpu", Z80, SINDBADM_SOUND_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(sindbadm_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
/* sound hardware */
- MDRV_SOUND_ADD("sn1", SN76496, SINDBADM_SOUND_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76496, SINDBADM_SOUND_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76496, SINDBADM_SOUND_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76496, SINDBADM_SOUND_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index 9e1a3be747d..52a2f96355f 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -912,78 +912,78 @@ static const samples_interface zektor_samples_interface =
static MACHINE_CONFIG_START( g80v_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(g80v)
- MDRV_MACHINE_RESET(g80v)
+ MCFG_MACHINE_START(g80v)
+ MCFG_MACHINE_RESET(g80v)
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(40)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(512, 1536, 640-32, 1408+32)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(40)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(512, 1536, 640-32, 1408+32)
- MDRV_VIDEO_START(segag80v)
- MDRV_VIDEO_UPDATE(segag80v)
+ MCFG_VIDEO_START(segag80v)
+ MCFG_VIDEO_UPDATE(segag80v)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( elim2, g80v_base )
/* custom sound board */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(elim2_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(elim2_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spacfury, g80v_base )
/* custom sound board */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spacfury_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spacfury_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
/* speech board */
- MDRV_FRAGMENT_ADD(sega_speech_board)
+ MCFG_FRAGMENT_ADD(sega_speech_board)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( zektor, g80v_base )
/* custom sound board */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(zektor_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(zektor_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("aysnd", AY8910, CPU_CLOCK/2/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("aysnd", AY8910, CPU_CLOCK/2/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
/* speech board */
- MDRV_FRAGMENT_ADD(sega_speech_board)
+ MCFG_FRAGMENT_ADD(sega_speech_board)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tacscan, g80v_base )
/* universal sound board */
- MDRV_FRAGMENT_ADD(sega_universal_sound_board)
+ MCFG_FRAGMENT_ADD(sega_universal_sound_board)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( startrek, g80v_base )
/* speech board */
- MDRV_FRAGMENT_ADD(sega_speech_board)
+ MCFG_FRAGMENT_ADD(sega_speech_board)
/* universal sound board */
- MDRV_FRAGMENT_ADD(sega_universal_sound_board)
+ MCFG_FRAGMENT_ADD(sega_universal_sound_board)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 2710644c3d0..e7f89cc5242 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -916,133 +916,133 @@ GFXDECODE_END
static MACHINE_CONFIG_START( hangon_base, segas1x_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/4)
- MDRV_CPU_PROGRAM_MAP(hangon_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/4)
+ MCFG_CPU_PROGRAM_MAP(hangon_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK_25MHz/4)
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", M68000, MASTER_CLOCK_25MHz/4)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_MACHINE_RESET(hangon)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_MACHINE_RESET(hangon)
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_PPI8255_ADD( "ppi8255_1", hangon_ppi_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_2", hangon_ppi_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_1", hangon_ppi_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_2", hangon_ppi_intf[1] )
/* video hardware */
- MDRV_GFXDECODE(segahang)
- MDRV_PALETTE_LENGTH(2048*3)
+ MCFG_GFXDECODE(segahang)
+ MCFG_PALETTE_LENGTH(2048*3)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224)
- MDRV_VIDEO_START(hangon)
- MDRV_VIDEO_UPDATE(hangon)
+ MCFG_VIDEO_START(hangon)
+ MCFG_VIDEO_UPDATE(hangon)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sharrier_base, hangon_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(MASTER_CLOCK_10MHz)
- MDRV_CPU_PROGRAM_MAP(sharrier_map)
- MDRV_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(MASTER_CLOCK_10MHz)
+ MCFG_CPU_PROGRAM_MAP(sharrier_map)
+ MCFG_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_CLOCK(MASTER_CLOCK_10MHz)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_CLOCK(MASTER_CLOCK_10MHz)
/* video hardware */
- MDRV_VIDEO_START(sharrier)
+ MCFG_VIDEO_START(sharrier)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( sound_board_2203 )
/* basic machine hardware */
- MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_map_2203)
- MDRV_CPU_IO_MAP(sound_portmap_2203)
+ MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map_2203)
+ MCFG_CPU_IO_MAP(sound_portmap_2203)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK_8MHz/2)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.37)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.37)
-
- MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz)
- MDRV_SOUND_CONFIG(segapcm_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK_8MHz/2)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.37)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.37)
+
+ MCFG_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz)
+ MCFG_SOUND_CONFIG(segapcm_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( sound_board_2203x2 )
/* basic machine hardware */
- MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_map_2151)
- MDRV_CPU_IO_MAP(sound_portmap_2203x2)
+ MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map_2151)
+ MCFG_CPU_IO_MAP(sound_portmap_2203x2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK_8MHz/2)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.37)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.37)
-
- MDRV_SOUND_ADD("ym2", YM2203, MASTER_CLOCK_8MHz/2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.13)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.13)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.37)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.37)
-
- MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2)
- MDRV_SOUND_CONFIG(segapcm_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK_8MHz/2)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.37)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.37)
+
+ MCFG_SOUND_ADD("ym2", YM2203, MASTER_CLOCK_8MHz/2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.13)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.13)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.37)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.37)
+
+ MCFG_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2)
+ MCFG_SOUND_CONFIG(segapcm_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( sound_board_2151 )
/* basic machine hardware */
- MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_map_2151)
- MDRV_CPU_IO_MAP(sound_portmap_2151)
+ MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map_2151)
+ MCFG_CPU_IO_MAP(sound_portmap_2151)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK_8MHz/2)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.43)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.43)
+ MCFG_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK_8MHz/2)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.43)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.43)
- MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2)
- MDRV_SOUND_CONFIG(segapcm_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2)
+ MCFG_SOUND_CONFIG(segapcm_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1054,54 +1054,54 @@ MACHINE_CONFIG_END
*************************************/
static MACHINE_CONFIG_DERIVED( hangon, hangon_base )
- MDRV_FRAGMENT_ADD(sound_board_2203)
+ MCFG_FRAGMENT_ADD(sound_board_2203)
- MDRV_SEGA16SP_ADD_HANGON("segaspr1")
+ MCFG_SEGA16SP_ADD_HANGON("segaspr1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( shangupb, hangon_base )
- MDRV_FRAGMENT_ADD(sound_board_2151)
+ MCFG_FRAGMENT_ADD(sound_board_2151)
/* not sure about these speeds, but at 6MHz, the road is not updated fast enough */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(10000000)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_CLOCK(10000000)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(10000000)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_CLOCK(10000000)
- MDRV_SEGA16SP_ADD_HANGON("segaspr1")
+ MCFG_SEGA16SP_ADD_HANGON("segaspr1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sharrier, sharrier_base )
- MDRV_FRAGMENT_ADD(sound_board_2203)
+ MCFG_FRAGMENT_ADD(sound_board_2203)
- MDRV_CPU_ADD("mcu", I8751, 8000000)
- MDRV_CPU_IO_MAP(mcu_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
+ MCFG_CPU_ADD("mcu", I8751, 8000000)
+ MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_pulse)
- MDRV_SEGA16SP_ADD_SHARRIER("segaspr1")
+ MCFG_SEGA16SP_ADD_SHARRIER("segaspr1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( enduror, sharrier_base )
- MDRV_FRAGMENT_ADD(sound_board_2151)
+ MCFG_FRAGMENT_ADD(sound_board_2151)
- MDRV_SEGA16SP_ADD_SHARRIER("segaspr1")
+ MCFG_SEGA16SP_ADD_SHARRIER("segaspr1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( enduror1, sharrier_base )
- MDRV_FRAGMENT_ADD(sound_board_2203)
+ MCFG_FRAGMENT_ADD(sound_board_2203)
- MDRV_SEGA16SP_ADD_SHARRIER("segaspr1")
+ MCFG_SEGA16SP_ADD_SHARRIER("segaspr1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( endurob2, sharrier_base )
- MDRV_FRAGMENT_ADD(sound_board_2203x2)
+ MCFG_FRAGMENT_ADD(sound_board_2203x2)
- MDRV_SEGA16SP_ADD_SHARRIER("segaspr1")
+ MCFG_SEGA16SP_ADD_SHARRIER("segaspr1")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index 4ba5110e2c2..4ecf70c2560 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -366,28 +366,28 @@ static MACHINE_START( astron )
static MACHINE_CONFIG_START( astron, segald_state )
/* main cpu */
- MDRV_CPU_ADD("maincpu", Z80, SCHEMATIC_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(mainmem)
- MDRV_CPU_IO_MAP(mainport)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1000.0/59.94)
+ MCFG_CPU_ADD("maincpu", Z80, SCHEMATIC_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(mainmem)
+ MCFG_CPU_IO_MAP(mainport)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 1000.0/59.94)
- MDRV_MACHINE_START(astron)
+ MCFG_MACHINE_START(astron)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(astron, 256, 256, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(astron, 256, 256, BITMAP_FORMAT_INDEXED16)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(segald)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(segald)
+ MCFG_PALETTE_LENGTH(256)
/* sound hardare */
- 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
diff --git a/src/mame/drivers/segamsys.c b/src/mame/drivers/segamsys.c
index 7f76552b00a..4322cd3327d 100644
--- a/src/mame/drivers/segamsys.c
+++ b/src/mame/drivers/segamsys.c
@@ -1712,34 +1712,34 @@ static NVRAM_HANDLER( sms )
}
MACHINE_CONFIG_START( sms, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, 3579540)
- //MDRV_CPU_PROGRAM_MAP(sms_map)
- MDRV_CPU_IO_MAP(sms_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, 3579540)
+ //MCFG_CPU_PROGRAM_MAP(sms_map)
+ MCFG_CPU_IO_MAP(sms_io_map)
/* IRQ handled via the timers */
- MDRV_MACHINE_RESET(sms)
+ MCFG_MACHINE_RESET(sms)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 223)
-// MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 191)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // Vblank handled manually.
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 223)
+// MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 191)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(sms)
- MDRV_VIDEO_UPDATE(megatech_md_sms) /* Copies a bitmap */
- MDRV_VIDEO_EOF(sms) /* Used to Sync the timing */
+ MCFG_VIDEO_START(sms)
+ MCFG_VIDEO_UPDATE(megatech_md_sms) /* Copies a bitmap */
+ MCFG_VIDEO_EOF(sms) /* Used to Sync the timing */
- MDRV_NVRAM_HANDLER( sms )
+ MCFG_NVRAM_HANDLER( sms )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76496, 3579540)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("snsnd", SN76496, 3579540)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index b3bcd7b4af7..29cf665a21d 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -1105,66 +1105,66 @@ GFXDECODE_END
static MACHINE_CONFIG_START( outrun_base, segas1x_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(outrun_map)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(outrun_map)
- MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", M68000, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_RESET(outrun)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_MACHINE_RESET(outrun)
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_PPI8255_ADD( "ppi8255", single_ppi_intf )
+ MCFG_PPI8255_ADD( "ppi8255", single_ppi_intf )
/* video hardware */
- MDRV_GFXDECODE(segaorun)
- MDRV_PALETTE_LENGTH(4096*3)
+ MCFG_GFXDECODE(segaorun)
+ MCFG_PALETTE_LENGTH(4096*3)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224)
- MDRV_VIDEO_START(outrun)
- MDRV_VIDEO_UPDATE(outrun)
+ MCFG_VIDEO_START(outrun)
+ MCFG_VIDEO_UPDATE(outrun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.43)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.43)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.43)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.43)
- MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/4)
- MDRV_SOUND_CONFIG(segapcm_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/4)
+ MCFG_SOUND_CONFIG(segapcm_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( outrundx, outrun_base )
- MDRV_SEGA16SP_ADD_OUTRUN("segaspr1")
+ MCFG_SEGA16SP_ADD_OUTRUN("segaspr1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( outrun, outrun_base )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_SEGA16SP_ADD_OUTRUN("segaspr1")
+ MCFG_SEGA16SP_ADD_OUTRUN("segaspr1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( shangon, outrun_base )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 321, 262, 0, 224)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 321, 262, 0, 224)
- MDRV_VIDEO_START(shangon)
- MDRV_VIDEO_UPDATE(shangon)
+ MCFG_VIDEO_START(shangon)
+ MCFG_VIDEO_UPDATE(shangon)
- MDRV_SEGA16SP_ADD_16B("segaspr1")
+ MCFG_SEGA16SP_ADD_16B("segaspr1")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 2a4f91af889..0cf7243695c 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -1944,68 +1944,68 @@ GFXDECODE_END
static MACHINE_CONFIG_START( system16a, segas1x_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(system16a_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(system16a_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("soundcpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_ADD("n7751", N7751, 6000000)
- MDRV_CPU_IO_MAP(n7751_portmap)
+ MCFG_CPU_ADD("n7751", N7751, 6000000)
+ MCFG_CPU_IO_MAP(n7751_portmap)
- MDRV_I8243_ADD("n7751_8243", NULL, n7751_rom_offset_w)
+ MCFG_I8243_ADD("n7751_8243", NULL, n7751_rom_offset_w)
- MDRV_MACHINE_START(system16a)
- MDRV_MACHINE_RESET(system16a)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(system16a)
+ MCFG_MACHINE_RESET(system16a)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PPI8255_ADD( "ppi8255", single_ppi_intf )
+ MCFG_PPI8255_ADD( "ppi8255", single_ppi_intf )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(342,262) /* to be verified */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(342,262) /* to be verified */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_SEGA16SP_ADD_16A("segaspr1")
+ MCFG_SEGA16SP_ADD_16A("segaspr1")
- MDRV_GFXDECODE(segas16a)
- MDRV_PALETTE_LENGTH(2048*3)
+ MCFG_GFXDECODE(segas16a)
+ MCFG_PALETTE_LENGTH(2048*3)
- MDRV_VIDEO_START(system16a)
- MDRV_VIDEO_UPDATE(system16a)
+ MCFG_VIDEO_START(system16a)
+ MCFG_VIDEO_UPDATE(system16a)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system16a_no7751, system16a )
- MDRV_DEVICE_REMOVE("n7751")
- MDRV_DEVICE_REMOVE("dac")
+ MCFG_DEVICE_REMOVE("n7751")
+ MCFG_DEVICE_REMOVE("dac")
- MDRV_SOUND_REPLACE("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system16a_8751, system16a )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
- MDRV_CPU_ADD("mcu", I8751, 8000000)
- MDRV_CPU_IO_MAP(mcu_io_map)
- MDRV_CPU_VBLANK_INT("screen", mcu_irq_assert)
+ MCFG_CPU_ADD("mcu", I8751, 8000000)
+ MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", mcu_irq_assert)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 756a194c3a3..a54f6bdf635 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -3271,49 +3271,49 @@ GFXDECODE_END
static MACHINE_CONFIG_START( system16b, segas1x_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_10MHz)
- MDRV_CPU_PROGRAM_MAP(system16b_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_10MHz)
+ MCFG_CPU_PROGRAM_MAP(system16b_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_10MHz/2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_10MHz/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_RESET(system16b)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(system16b)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_GFXDECODE(segas16b)
- MDRV_PALETTE_LENGTH(2048*3)
+ MCFG_GFXDECODE(segas16b)
+ MCFG_PALETTE_LENGTH(2048*3)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_25MHz/4, 400, 0, 320, 262, 0, 224)
- MDRV_VIDEO_START(system16b)
- MDRV_VIDEO_UPDATE(system16b)
+ MCFG_VIDEO_START(system16b)
+ MCFG_VIDEO_UPDATE(system16b)
- MDRV_SEGA16SP_ADD_16B("segaspr1")
+ MCFG_SEGA16SP_ADD_16B("segaspr1")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK_8MHz/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
+ MCFG_SOUND_ADD("ymsnd", YM2151, MASTER_CLOCK_8MHz/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_CONFIG(upd7759_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.48)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_CONFIG(upd7759_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.48)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system16b_8751, system16b )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", i8751_main_cpu_vblank)
- MDRV_CPU_ADD("mcu", I8751, MASTER_CLOCK_8MHz)
- MDRV_CPU_IO_MAP(mcu_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
+ MCFG_CPU_ADD("mcu", I8751, MASTER_CLOCK_8MHz)
+ MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_pulse)
MACHINE_CONFIG_END
/* same as the above, but with custom Sega ICs */
@@ -3325,16 +3325,16 @@ static const ic_315_5250_interface sys16b_5250_intf =
static MACHINE_CONFIG_DERIVED( system16b_5248, system16b )
- MDRV_315_5248_ADD("315_5248")
- MDRV_315_5250_ADD("315_5250_1", sys16b_5250_intf)
- MDRV_315_5250_ADD("315_5250_2", sys16b_5250_intf)
+ MCFG_315_5248_ADD("315_5248")
+ MCFG_315_5250_ADD("315_5250_1", sys16b_5250_intf)
+ MCFG_315_5250_ADD("315_5250_2", sys16b_5250_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system16b_8751_5248, system16b_8751 )
- MDRV_315_5248_ADD("315_5248")
- MDRV_315_5250_ADD("315_5250_1", sys16b_5250_intf)
- MDRV_315_5250_ADD("315_5250_2", sys16b_5250_intf)
+ MCFG_315_5248_ADD("315_5248")
+ MCFG_315_5250_ADD("315_5250_1", sys16b_5250_intf)
+ MCFG_315_5250_ADD("315_5250_2", sys16b_5250_intf)
MACHINE_CONFIG_END
@@ -3348,21 +3348,21 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( atomicp, system16b ) /* 10MHz CPU Clock verified */
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("soundcpu")
+ MCFG_DEVICE_REMOVE("soundcpu")
- MDRV_MACHINE_START(atomicp)
- MDRV_TIMER_ADD_PERIODIC("atomicp_timer", atomicp_sound_irq, HZ(10000))
+ MCFG_MACHINE_START(atomicp)
+ MCFG_TIMER_ADD_PERIODIC("atomicp_timer", atomicp_sound_irq, HZ(10000))
/* sound hardware */
- MDRV_SOUND_REPLACE("ymsnd", YM2413, XTAL_20MHz/4) /* 20MHz OSC divided by 4 (verified) */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("ymsnd", YM2413, XTAL_20MHz/4) /* 20MHz OSC divided by 4 (verified) */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_DEVICE_REMOVE("upd")
+ MCFG_DEVICE_REMOVE("upd")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( timescan, system16b )
- MDRV_VIDEO_START(timscanr)
+ MCFG_VIDEO_START(timscanr)
MACHINE_CONFIG_END
@@ -7149,14 +7149,14 @@ static MACHINE_RESET( isgsm )
static MACHINE_CONFIG_DERIVED( isgsm, system16b )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("maincpu")
+ MCFG_DEVICE_REMOVE("maincpu")
- MDRV_CPU_ADD("maincpu", M68000, 16000000) // no obvious CPU, but seems to be clocked faster than an original system16 based on the boot times
- MDRV_CPU_PROGRAM_MAP(isgsm_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) // no obvious CPU, but seems to be clocked faster than an original system16 based on the boot times
+ MCFG_CPU_PROGRAM_MAP(isgsm_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(isgsm)
- MDRV_MACHINE_RESET(isgsm)
+ MCFG_MACHINE_START(isgsm)
+ MCFG_MACHINE_RESET(isgsm)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 23e54d61ca9..7651af04d16 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -1278,53 +1278,53 @@ GFXDECODE_END
static MACHINE_CONFIG_START( system18, segas1x_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(system18_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(system18_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("soundcpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_RESET(system18)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(system18)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.23) /* verified on pcb */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(342,262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.23) /* verified on pcb */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(342,262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(segas18)
- MDRV_PALETTE_LENGTH(2048*3+2048)
+ MCFG_GFXDECODE(segas18)
+ MCFG_PALETTE_LENGTH(2048*3+2048)
- MDRV_VIDEO_START(system18)
- MDRV_VIDEO_UPDATE(system18)
+ MCFG_VIDEO_START(system18)
+ MCFG_VIDEO_UPDATE(system18)
- MDRV_SEGA16SP_ADD_16B("segaspr1")
+ MCFG_SEGA16SP_ADD_16B("segaspr1")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM3438, 8000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM3438, 8000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM3438, 8000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ym2", YM3438, 8000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("rfsnd", RF5C68, 10000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("rfsnd", RF5C68, 10000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system18_8751, system18 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT_HACK(NULL,0)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT_HACK(NULL,0)
- MDRV_CPU_ADD("mcu", I8751, 8000000)
- MDRV_CPU_IO_MAP(mcu_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("mcu", I8751, 8000000)
+ MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index a6510f2ecf0..7016ad4f860 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -1774,46 +1774,46 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( system24, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(system24_cpu1_map)
- MDRV_CPU_VBLANK_INT_HACK(irq_vbl, 2)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(system24_cpu1_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq_vbl, 2)
- MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(system24_cpu2_map)
+ MCFG_CPU_ADD("sub", M68000, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(system24_cpu2_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(system24)
- MDRV_MACHINE_RESET(system24)
+ MCFG_MACHINE_START(system24)
+ MCFG_MACHINE_RESET(system24)
- MDRV_TIMER_ADD("irq_timer", irq_timer_cb)
- MDRV_TIMER_ADD("irq_timer_clear", irq_timer_clear_cb)
+ MCFG_TIMER_ADD("irq_timer", irq_timer_cb)
+ MCFG_TIMER_ADD("irq_timer_clear", irq_timer_clear_cb)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_PALETTE_LENGTH(8192*2)
+ MCFG_PALETTE_LENGTH(8192*2)
- MDRV_VIDEO_START(system24)
- MDRV_VIDEO_UPDATE(system24)
+ MCFG_VIDEO_START(system24)
+ MCFG_VIDEO_UPDATE(system24)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( system24_floppy, system24 )
- MDRV_NVRAM_HANDLER(system24)
+ MCFG_NVRAM_HANDLER(system24)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 987ade72a8c..cea96f01bef 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -2186,49 +2186,49 @@ static READ16_HANDLER( dual_pcb_masterslave )
static MACHINE_CONFIG_START( system32, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V60, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(system32_map)
- MDRV_CPU_VBLANK_INT("screen", start_of_vblank_int)
+ MCFG_CPU_ADD("maincpu", V60, MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(system32_map)
+ MCFG_CPU_VBLANK_INT("screen", start_of_vblank_int)
- MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(system32_sound_map)
- MDRV_CPU_IO_MAP(system32_sound_portmap)
+ MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(system32_sound_map)
+ MCFG_CPU_IO_MAP(system32_sound_portmap)
- MDRV_MACHINE_RESET(system32)
+ MCFG_MACHINE_RESET(system32)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_TIMER_ADD("v60_irq0", signal_v60_irq_callback)
- MDRV_TIMER_ADD("v60_irq1", signal_v60_irq_callback)
+ MCFG_TIMER_ADD("v60_irq0", signal_v60_irq_callback)
+ MCFG_TIMER_ADD("v60_irq1", signal_v60_irq_callback)
/* video hardware */
- MDRV_GFXDECODE(segas32)
- MDRV_PALETTE_LENGTH(0x4000)
+ MCFG_GFXDECODE(segas32)
+ MCFG_PALETTE_LENGTH(0x4000)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(52*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(52*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1)
- MDRV_VIDEO_START(system32)
- MDRV_VIDEO_UPDATE(system32)
+ MCFG_VIDEO_START(system32)
+ MCFG_VIDEO_UPDATE(system32)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ym1", YM3438, MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(ym3438_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ym1", YM3438, MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(ym3438_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MDRV_SOUND_ADD("ym2", YM3438, MASTER_CLOCK/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ym2", YM3438, MASTER_CLOCK/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MDRV_SOUND_ADD("rfsnd", RF5C68, RFC_CLOCK/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.55)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.55)
+ MCFG_SOUND_ADD("rfsnd", RF5C68, RFC_CLOCK/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.55)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.55)
MACHINE_CONFIG_END
@@ -2237,61 +2237,61 @@ static const nec_config ga2_v25_config ={ ga2_v25_opcode_table, };
static MACHINE_CONFIG_DERIVED( system32_v25, system32 )
/* add a V25 for protection */
- MDRV_CPU_ADD("mcu", V25, 10000000)
- MDRV_CPU_PROGRAM_MAP(ga2_v25_map)
- MDRV_CPU_CONFIG(ga2_v25_config)
+ MCFG_CPU_ADD("mcu", V25, 10000000)
+ MCFG_CPU_PROGRAM_MAP(ga2_v25_map)
+ MCFG_CPU_CONFIG(ga2_v25_config)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( multi32, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V70, MULTI32_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(multi32_map)
- MDRV_CPU_VBLANK_INT("lscreen", start_of_vblank_int)
+ MCFG_CPU_ADD("maincpu", V70, MULTI32_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(multi32_map)
+ MCFG_CPU_VBLANK_INT("lscreen", start_of_vblank_int)
- MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(multi32_sound_map)
- MDRV_CPU_IO_MAP(multi32_sound_portmap)
+ MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(multi32_sound_map)
+ MCFG_CPU_IO_MAP(multi32_sound_portmap)
- MDRV_MACHINE_RESET(system32)
+ MCFG_MACHINE_RESET(system32)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_TIMER_ADD("v60_irq0", signal_v60_irq_callback)
- MDRV_TIMER_ADD("v60_irq1", signal_v60_irq_callback)
+ MCFG_TIMER_ADD("v60_irq0", signal_v60_irq_callback)
+ MCFG_TIMER_ADD("v60_irq1", signal_v60_irq_callback)
/* video hardware */
- MDRV_GFXDECODE(segas32)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_GFXDECODE(segas32)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(52*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(52*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(52*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(52*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1)
- MDRV_VIDEO_START(multi32)
- MDRV_VIDEO_UPDATE(multi32)
+ MCFG_VIDEO_START(multi32)
+ MCFG_VIDEO_UPDATE(multi32)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3438, MASTER_CLOCK/4)
- MDRV_SOUND_CONFIG(ym3438_config)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM3438, MASTER_CLOCK/4)
+ MCFG_SOUND_CONFIG(ym3438_config)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.40)
- MDRV_SOUND_ADD("sega", MULTIPCM, MASTER_CLOCK/4)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("sega", MULTIPCM, MASTER_CLOCK/4)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 49dbbc29a59..de6de85155d 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -1337,61 +1337,61 @@ static const ic_315_5250_interface segaxb_5250_2_intf =
static MACHINE_CONFIG_START( xboard, segas1x_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("sub", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("sub", M68000, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_RESET(xboard)
- MDRV_NVRAM_ADD_0FILL("backup1")
- MDRV_NVRAM_ADD_0FILL("backup2")
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_MACHINE_RESET(xboard)
+ MCFG_NVRAM_ADD_0FILL("backup1")
+ MCFG_NVRAM_ADD_0FILL("backup2")
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_315_5248_ADD("5248_main")
- MDRV_315_5248_ADD("5248_subx")
- MDRV_315_5249_ADD("5249_main")
- MDRV_315_5249_ADD("5249_subx")
- MDRV_315_5250_ADD("5250_main", segaxb_5250_1_intf)
- MDRV_315_5250_ADD("5250_subx", segaxb_5250_2_intf)
+ MCFG_315_5248_ADD("5248_main")
+ MCFG_315_5248_ADD("5248_subx")
+ MCFG_315_5249_ADD("5249_main")
+ MCFG_315_5249_ADD("5249_subx")
+ MCFG_315_5250_ADD("5250_main", segaxb_5250_1_intf)
+ MCFG_315_5250_ADD("5250_subx", segaxb_5250_2_intf)
/* video hardware */
- MDRV_GFXDECODE(segaxbd)
- MDRV_PALETTE_LENGTH(8192*3)
+ MCFG_GFXDECODE(segaxbd)
+ MCFG_PALETTE_LENGTH(8192*3)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/8, 400, 0, 320, 262, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/8, 400, 0, 320, 262, 0, 224)
- MDRV_VIDEO_START(xboard)
- MDRV_VIDEO_UPDATE(xboard)
+ MCFG_VIDEO_START(xboard)
+ MCFG_VIDEO_UPDATE(xboard)
- MDRV_SEGA16SP_ADD_XBOARD("segaspr1")
+ MCFG_SEGA16SP_ADD_XBOARD("segaspr1")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.43)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.43)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.43)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.43)
- MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/4)
- MDRV_SOUND_CONFIG(segapcm_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/4)
+ MCFG_SOUND_CONFIG(segapcm_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( smgp, xboard )
- MDRV_CPU_ADD("comm", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(smgp_comm_map)
- MDRV_CPU_IO_MAP(smgp_comm_portmap)
+ MCFG_CPU_ADD("comm", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(smgp_comm_map)
+ MCFG_CPU_IO_MAP(smgp_comm_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index cb08e49fa65..8271db144fb 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -989,60 +989,60 @@ static const sega_pcm_interface segapcm_interface =
static MACHINE_CONFIG_START( yboard, segas1x_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("subx", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(subx_map)
+ MCFG_CPU_ADD("subx", M68000, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(subx_map)
- MDRV_CPU_ADD("suby", M68000, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(suby_map)
+ MCFG_CPU_ADD("suby", M68000, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(suby_map)
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_START(yboard)
- MDRV_MACHINE_RESET(yboard)
- MDRV_NVRAM_ADD_0FILL("backupram")
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_MACHINE_START(yboard)
+ MCFG_MACHINE_RESET(yboard)
+ MCFG_NVRAM_ADD_0FILL("backupram")
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_TIMER_ADD("int_timer", scanline_callback)
+ MCFG_TIMER_ADD("int_timer", scanline_callback)
- MDRV_315_5248_ADD("5248_main")
- MDRV_315_5248_ADD("5248_subx")
- MDRV_315_5248_ADD("5248_suby")
- MDRV_315_5249_ADD("5249_main")
- MDRV_315_5249_ADD("5249_subx")
- MDRV_315_5249_ADD("5249_suby")
+ MCFG_315_5248_ADD("5248_main")
+ MCFG_315_5248_ADD("5248_subx")
+ MCFG_315_5248_ADD("5248_suby")
+ MCFG_315_5249_ADD("5249_main")
+ MCFG_315_5249_ADD("5249_subx")
+ MCFG_315_5249_ADD("5249_suby")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(342,262) /* to be verified */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(342,262) /* to be verified */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_SEGA16SP_ADD_YBOARD_16B("segaspr1")
- MDRV_SEGA16SP_ADD_YBOARD("segaspr2")
+ MCFG_SEGA16SP_ADD_YBOARD_16B("segaspr1")
+ MCFG_SEGA16SP_ADD_YBOARD("segaspr2")
- MDRV_PALETTE_LENGTH(8192*3)
+ MCFG_PALETTE_LENGTH(8192*3)
- MDRV_VIDEO_START(yboard)
- MDRV_VIDEO_UPDATE(yboard)
+ MCFG_VIDEO_START(yboard)
+ MCFG_VIDEO_UPDATE(yboard)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.43)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.43)
+ MCFG_SOUND_ADD("ymsnd", YM2151, SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.43)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.43)
- MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/8)
- MDRV_SOUND_CONFIG(segapcm_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/8)
+ MCFG_SOUND_CONFIG(segapcm_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 0bae8c08e34..efac4e80497 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1857,45 +1857,45 @@ static MACHINE_RESET( spi )
static MACHINE_CONFIG_START( spi, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I386, 50000000/2) /* Intel 386DX, 25MHz */
- MDRV_CPU_PROGRAM_MAP(spi_map)
- MDRV_CPU_VBLANK_INT("screen", spi_interrupt)
+ MCFG_CPU_ADD("maincpu", I386, 50000000/2) /* Intel 386DX, 25MHz */
+ MCFG_CPU_PROGRAM_MAP(spi_map)
+ MCFG_CPU_VBLANK_INT("screen", spi_interrupt)
- MDRV_CPU_ADD("soundcpu", Z80, 28636360/4)
- MDRV_CPU_PROGRAM_MAP(spisound_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 28636360/4)
+ MCFG_CPU_PROGRAM_MAP(spisound_map)
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_START(spi)
- MDRV_MACHINE_RESET(spi)
+ MCFG_MACHINE_START(spi)
+ MCFG_MACHINE_RESET(spi)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_DS2404_ADD("ds2404", 1995, 1, 1)
+ MCFG_DS2404_ADD("ds2404", 1995, 1, 1)
- MDRV_INTEL_E28F008SA_ADD("flash0")
- MDRV_INTEL_E28F008SA_ADD("flash1")
+ MCFG_INTEL_E28F008SA_ADD("flash0")
+ MCFG_INTEL_E28F008SA_ADD("flash1")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(spi)
- MDRV_PALETTE_LENGTH(6144)
+ MCFG_GFXDECODE(spi)
+ MCFG_PALETTE_LENGTH(6144)
- MDRV_VIDEO_START(spi)
- MDRV_VIDEO_UPDATE(spi)
+ MCFG_VIDEO_START(spi)
+ MCFG_VIDEO_UPDATE(spi)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymf", YMF271, 16934400)
- MDRV_SOUND_CONFIG(ymf271_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymf", YMF271, 16934400)
+ MCFG_SOUND_CONFIG(ymf271_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_START( sxx2f )
@@ -1922,33 +1922,33 @@ static MACHINE_RESET( sxx2f )
static MACHINE_CONFIG_DERIVED( sxx2f, spi ) /* Intel i386DX @ 25MHz, YMF271 @ 16.9344MHz, Z80 @ 7.159MHz(?) */
- MDRV_MACHINE_START(sxx2f)
- MDRV_MACHINE_RESET(sxx2f)
+ MCFG_MACHINE_START(sxx2f)
+ MCFG_MACHINE_RESET(sxx2f)
- MDRV_DEVICE_REMOVE("flash0")
- MDRV_DEVICE_REMOVE("flash1")
+ MCFG_DEVICE_REMOVE("flash0")
+ MCFG_DEVICE_REMOVE("flash1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sxx2g, spi ) /* single board version using measured clocks */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(28636360) /* AMD AM386DX/DX-40, 28.63636MHz */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(28636360) /* AMD AM386DX/DX-40, 28.63636MHz */
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CLOCK(4915200) /* 4.9152MHz */
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CLOCK(4915200) /* 4.9152MHz */
- MDRV_SOUND_REPLACE("ymf", YMF271, 16384000) /* 16.3840MHz */
- MDRV_SOUND_CONFIG(ymf271_config)
+ MCFG_SOUND_REPLACE("ymf", YMF271, 16384000) /* 16.3840MHz */
+ MCFG_SOUND_CONFIG(ymf271_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_MACHINE_START(sxx2f)
- MDRV_MACHINE_RESET(sxx2f)
+ MCFG_MACHINE_START(sxx2f)
+ MCFG_MACHINE_RESET(sxx2f)
- MDRV_DEVICE_REMOVE("flash0")
- MDRV_DEVICE_REMOVE("flash1")
+ MCFG_DEVICE_REMOVE("flash0")
+ MCFG_DEVICE_REMOVE("flash1")
MACHINE_CONFIG_END
@@ -2201,35 +2201,35 @@ static MACHINE_RESET( seibu386 )
static MACHINE_CONFIG_START( seibu386, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I386, 40000000) /* AMD 386DX, 40MHz */
- MDRV_CPU_PROGRAM_MAP(seibu386_map)
- MDRV_CPU_VBLANK_INT("screen", spi_interrupt)
+ MCFG_CPU_ADD("maincpu", I386, 40000000) /* AMD 386DX, 40MHz */
+ MCFG_CPU_PROGRAM_MAP(seibu386_map)
+ MCFG_CPU_VBLANK_INT("screen", spi_interrupt)
- MDRV_MACHINE_RESET(seibu386)
+ MCFG_MACHINE_RESET(seibu386)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(spi)
- MDRV_PALETTE_LENGTH(6144)
+ MCFG_GFXDECODE(spi)
+ MCFG_PALETTE_LENGTH(6144)
- MDRV_VIDEO_START(spi)
- MDRV_VIDEO_UPDATE(spi)
+ MCFG_VIDEO_START(spi)
+ MCFG_VIDEO_UPDATE(spi)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", 1431815, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki1", 1431815, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki2", 1431815, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki2", 1431815, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/* SYS386-F V2.0 */
@@ -2255,35 +2255,35 @@ static DRIVER_INIT( sys386f2 )
static MACHINE_CONFIG_START( sys386f2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I386, 25000000) /* 25mhz */
- MDRV_CPU_PROGRAM_MAP(sys386f2_map)
- MDRV_CPU_VBLANK_INT("screen", spi_interrupt)
+ MCFG_CPU_ADD("maincpu", I386, 25000000) /* 25mhz */
+ MCFG_CPU_PROGRAM_MAP(sys386f2_map)
+ MCFG_CPU_VBLANK_INT("screen", spi_interrupt)
/* no z80? */
- MDRV_MACHINE_RESET(seibu386)
+ MCFG_MACHINE_RESET(seibu386)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.59)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.59)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(sys386f2)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(sys386f2)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(sys386f2)
- MDRV_VIDEO_UPDATE(sys386f2)
+ MCFG_VIDEO_START(sys386f2)
+ MCFG_VIDEO_UPDATE(sys386f2)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index a7ce1301af7..5e5092a4f55 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -394,53 +394,53 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( nvram, seicross_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mcu", NSC8105, 6000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(mcu_nvram_map)
+ MCFG_CPU_ADD("mcu", NSC8105, 6000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(mcu_nvram_map)
- MDRV_QUANTUM_TIME(HZ(1200)) /* 20 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(1200)) /* 20 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_RESET(friskyt)
- MDRV_NVRAM_HANDLER(seicross)
+ MCFG_MACHINE_RESET(friskyt)
+ MCFG_NVRAM_HANDLER(seicross)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* frames per second, vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* frames per second, vblank duration */)
+ 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)
- MDRV_GFXDECODE(seicross)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(seicross)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(seicross)
- MDRV_VIDEO_START(seicross)
- MDRV_VIDEO_UPDATE(seicross)
+ MCFG_PALETTE_INIT(seicross)
+ MCFG_VIDEO_START(seicross)
+ MCFG_VIDEO_UPDATE(seicross)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1536000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1536000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( no_nvram, nvram )
/* basic machine hardware */
- MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_PROGRAM_MAP(mcu_no_nvram_map)
+ MCFG_CPU_MODIFY("mcu")
+ MCFG_CPU_PROGRAM_MAP(mcu_no_nvram_map)
- MDRV_NVRAM_HANDLER(0)
+ MCFG_NVRAM_HANDLER(0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 8d85057abff..4ccd269385b 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -279,29 +279,29 @@ static INTERRUPT_GEN( sengokmj_interrupt )
static MACHINE_CONFIG_START( sengokmj, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30, 16000000/2) /* V30-8 */
- MDRV_CPU_PROGRAM_MAP(sengokmj_map)
- MDRV_CPU_IO_MAP(sengokmj_io_map)
- MDRV_CPU_VBLANK_INT("screen", sengokmj_interrupt)
+ MCFG_CPU_ADD("maincpu", V30, 16000000/2) /* V30-8 */
+ MCFG_CPU_PROGRAM_MAP(sengokmj_map)
+ MCFG_CPU_IO_MAP(sengokmj_io_map)
+ MCFG_CPU_VBLANK_INT("screen", sengokmj_interrupt)
SEIBU_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_MACHINE_RESET(seibu_sound)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(seibu_sound)
+ 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) //TODO: dynamic resolution
-
- MDRV_GFXDECODE(sengokmj)
- MDRV_PALETTE_LENGTH(0x800)
-
- MDRV_VIDEO_START(seibu_crtc)
- MDRV_VIDEO_UPDATE(seibu_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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) //TODO: dynamic resolution
+
+ MCFG_GFXDECODE(sengokmj)
+ MCFG_PALETTE_LENGTH(0x800)
+
+ MCFG_VIDEO_START(seibu_crtc)
+ MCFG_VIDEO_UPDATE(seibu_crtc)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1320000)
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 47474b88d8f..9a8442be047 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -547,60 +547,60 @@ static const samples_interface senjyo_samples_interface =
static MACHINE_CONFIG_START( senjyo, senjyo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(senjyo_map)
- MDRV_CPU_VBLANK_INT("screen", senjyo_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(senjyo_map)
+ MCFG_CPU_VBLANK_INT("screen", senjyo_interrupt)
- MDRV_CPU_ADD("sub", Z80, 2000000) /* 2 MHz? */
- MDRV_CPU_CONFIG(senjyo_daisy_chain)
- MDRV_CPU_PROGRAM_MAP(senjyo_sound_map)
- MDRV_CPU_IO_MAP(senjyo_sound_io_map)
+ MCFG_CPU_ADD("sub", Z80, 2000000) /* 2 MHz? */
+ MCFG_CPU_CONFIG(senjyo_daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(senjyo_sound_map)
+ MCFG_CPU_IO_MAP(senjyo_sound_io_map)
- MDRV_MACHINE_RESET(senjyo)
+ MCFG_MACHINE_RESET(senjyo)
- MDRV_Z80PIO_ADD( "z80pio", 2000000, senjyo_pio_intf )
- MDRV_Z80CTC_ADD( "z80ctc", 2000000 /* same as "sub" */, senjyo_ctc_intf )
+ MCFG_Z80PIO_ADD( "z80pio", 2000000, senjyo_pio_intf )
+ MCFG_Z80CTC_ADD( "z80ctc", 2000000 /* same as "sub" */, senjyo_ctc_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(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_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)
- MDRV_GFXDECODE(senjyo)
- MDRV_PALETTE_LENGTH(512+2) /* 512 real palette + 2 for the radar */
+ MCFG_GFXDECODE(senjyo)
+ MCFG_PALETTE_LENGTH(512+2) /* 512 real palette + 2 for the radar */
- MDRV_VIDEO_START(senjyo)
- MDRV_VIDEO_UPDATE(senjyo)
+ MCFG_VIDEO_START(senjyo)
+ MCFG_VIDEO_UPDATE(senjyo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76496, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn3", SN76496, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn3", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(senjyo_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(senjyo_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( starforb, senjyo )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(starforb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(starforb_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(starforb_sound_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(starforb_sound_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index d55c85bb2e9..fa9cbd71638 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -6864,39 +6864,39 @@ static INTERRUPT_GEN( tndrcade_sub_interrupt )
static MACHINE_CONFIG_START( tndrcade, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(tndrcade_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(tndrcade_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(tndrcade_sub_map)
- MDRV_CPU_VBLANK_INT_HACK(tndrcade_sub_interrupt,TNDRCADE_SUB_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(tndrcade_sub_map)
+ MCFG_CPU_VBLANK_INT_HACK(tndrcade_sub_interrupt,TNDRCADE_SUB_INTERRUPTS_NUM)
/* 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, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ym1", YM2203, 16000000/4) /* 4 MHz */
- MDRV_SOUND_CONFIG(tndrcade_ym2203_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_SOUND_ADD("ym1", YM2203, 16000000/4) /* 4 MHz */
+ MCFG_SOUND_CONFIG(tndrcade_ym2203_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
- MDRV_SOUND_ADD("ym2", YM3812, 16000000/4) /* 4 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3812, 16000000/4) /* 4 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -6913,35 +6913,35 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( twineagl, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(downtown_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(downtown_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)
- MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(twineagl_sub_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(twineagl_sub_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(downtown)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(downtown)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(twineagl_1_layer)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(twineagl_1_layer)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -6954,33 +6954,33 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( downtown, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(downtown_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(downtown_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
- MDRV_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(downtown_sub_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(downtown_sub_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.42) /* 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, 48*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.42) /* 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, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(downtown)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(downtown)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(seta_1_layer)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_1_layer)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -7011,38 +7011,38 @@ static INTERRUPT_GEN( calibr50_interrupt )
static MACHINE_CONFIG_START( usclssic, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(usclssic_map)
- MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(usclssic_map)
+ MCFG_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM)
- MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(calibr50_sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI caused by main cpu when writing to the sound latch */
+ MCFG_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(calibr50_sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI caused by main cpu when writing to the sound latch */
- MDRV_MACHINE_RESET(calibr50)
+ MCFG_MACHINE_RESET(calibr50)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(usclssic)
- MDRV_PALETTE_LENGTH(16*32 + 64*32*2) /* sprites, layer */
+ MCFG_GFXDECODE(usclssic)
+ MCFG_PALETTE_LENGTH(16*32 + 64*32*2) /* sprites, layer */
- MDRV_PALETTE_INIT(usclssic) /* layer is 6 planes deep */
- MDRV_VIDEO_START(seta_1_layer)
- MDRV_VIDEO_UPDATE(usclssic)
+ MCFG_PALETTE_INIT(usclssic) /* layer is 6 planes deep */
+ MCFG_VIDEO_START(seta_1_layer)
+ MCFG_VIDEO_UPDATE(usclssic)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7058,36 +7058,36 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( calibr50, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(calibr50_map)
- MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(calibr50_map)
+ MCFG_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM)
- MDRV_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(calibr50_sub_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* IRQ: 4/frame
+ MCFG_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(calibr50_sub_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* IRQ: 4/frame
NMI: when the 68k writes the sound latch */
- MDRV_MACHINE_RESET(calibr50)
+ MCFG_MACHINE_RESET(calibr50)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.42) /* 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, 48*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.42) /* 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, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(downtown)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(downtown)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(seta_1_layer)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_1_layer)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -7100,35 +7100,35 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( metafox, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(downtown_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(downtown_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)
- MDRV_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(metafox_sub_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(metafox_sub_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
/* 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, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(downtown)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(downtown)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(seta_1_layer)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_1_layer)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7139,31 +7139,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( atehate, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(atehate_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(atehate_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7180,65 +7180,65 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( blandia, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(blandia_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(blandia_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(blandia)
- MDRV_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer1, layer2 */
+ MCFG_GFXDECODE(blandia)
+ MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer1, layer2 */
- MDRV_PALETTE_INIT(blandia) /* layers 1&2 are 6 planes deep */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_EOF(seta_buffer_sprites) /* Blandia uses sprite buffering */
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_PALETTE_INIT(blandia) /* layers 1&2 are 6 planes deep */
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_EOF(seta_buffer_sprites) /* Blandia uses sprite buffering */
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( blandiap, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(blandiap_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(blandiap_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(blandia)
- MDRV_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer1, layer2 */
+ MCFG_GFXDECODE(blandia)
+ MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer1, layer2 */
- MDRV_PALETTE_INIT(blandia) /* layers 1&2 are 6 planes deep */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_EOF(seta_buffer_sprites) /* Blandia uses sprite buffering */
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_PALETTE_INIT(blandia) /* layers 1&2 are 6 planes deep */
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_EOF(seta_buffer_sprites) /* Blandia uses sprite buffering */
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7249,31 +7249,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( blockcar, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(blockcar_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(blockcar_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7284,31 +7284,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( daioh, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(daioh_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(daioh_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -7324,32 +7324,32 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( drgnunit, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(drgnunit_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(drgnunit_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(downtown)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(downtown)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(seta_1_layer)
- MDRV_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_1_layer)
+ MCFG_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/* Same as qzkklogy, but with a 16MHz CPU and different
@@ -7358,32 +7358,32 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( qzkklgy2, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(drgnunit_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(drgnunit_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(qzkklgy2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(qzkklgy2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(seta_1_layer)
- MDRV_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_1_layer)
+ MCFG_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -7404,33 +7404,33 @@ static INTERRUPT_GEN( setaroul_interrupt )
static MACHINE_CONFIG_START( setaroul, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(setaroul_map)
- MDRV_CPU_VBLANK_INT_HACK(setaroul_interrupt,SETAROUL_INTERRUPTS_NUM) // and 6?
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(setaroul_map)
+ MCFG_CPU_VBLANK_INT_HACK(setaroul_interrupt,SETAROUL_INTERRUPTS_NUM) // and 6?
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(setaroul)
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(setaroul)
+ MCFG_GFXDECODE(setaroul)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(setaroul)
- MDRV_VIDEO_START(seta_1_layer)
- MDRV_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_1_layer)
+ MCFG_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7441,31 +7441,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( eightfrc, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7481,32 +7481,32 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( extdwnhl, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(extdwnhl_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(extdwnhl_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 40*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(zingzip)
- MDRV_PALETTE_LENGTH(16*32+16*32+64*32*2) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(zingzip)
+ MCFG_PALETTE_LENGTH(16*32+16*32+64*32*2) /* sprites, layer2, layer1 */
- MDRV_PALETTE_INIT(zingzip) /* layer 1 gfx is 6 planes deep */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_PALETTE_INIT(zingzip) /* layer 1 gfx is 6 planes deep */
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7533,41 +7533,41 @@ static MACHINE_START( wrofaero ) { uPD71054_timer_init(machine); }
static MACHINE_CONFIG_START( gundhara, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(wrofaero_map)
#if __uPD71054_TIMER
-// MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+// MCFG_CPU_VBLANK_INT("screen", wrofaero_interrupt)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
#else
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
#endif // __uPD71054_TIMER
#if __uPD71054_TIMER
- MDRV_MACHINE_START( wrofaero )
+ MCFG_MACHINE_START( wrofaero )
#endif // __uPD71054_TIMER
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(jjsquawk)
- MDRV_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(jjsquawk)
+ MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */
- MDRV_PALETTE_INIT(gundhara) /* layers are 6 planes deep (but have only 4 palettes) */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_PALETTE_INIT(gundhara) /* layers are 6 planes deep (but have only 4 palettes) */
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7582,63 +7582,63 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jjsquawk, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(jjsquawk)
- MDRV_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(jjsquawk)
+ MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */
- MDRV_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jjsquawb, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(jjsquawb_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(jjsquawb_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(jjsquawk)
- MDRV_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(jjsquawk)
+ MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */
- MDRV_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -7649,35 +7649,35 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kamenrid, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(kamenrid_map)
- MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(kamenrid_map)
+ MCFG_CPU_VBLANK_INT("screen", wrofaero_interrupt)
#if __uPD71054_TIMER
- MDRV_MACHINE_START( wrofaero )
+ MCFG_MACHINE_START( wrofaero )
#endif // __uPD71054_TIMER
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -7689,31 +7689,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( orbs, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
- MDRV_CPU_PROGRAM_MAP(orbs_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
+ MCFG_CPU_PROGRAM_MAP(orbs_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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(1*8, 39*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(orbs)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(orbs)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7724,33 +7724,33 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( keroppi, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
- MDRV_CPU_PROGRAM_MAP(keroppi_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
+ MCFG_CPU_PROGRAM_MAP(keroppi_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
- MDRV_MACHINE_START(keroppi)
+ MCFG_MACHINE_START(keroppi)
/* 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, 40*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(orbs)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(orbs)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7761,31 +7761,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( krzybowl, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(krzybowl_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(krzybowl_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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(1*8, 39*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7797,37 +7797,37 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( madshark, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(madshark_map)
- MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(madshark_map)
+ MCFG_CPU_VBLANK_INT("screen", wrofaero_interrupt)
#if __uPD71054_TIMER
- MDRV_MACHINE_START( wrofaero )
+ MCFG_MACHINE_START( wrofaero )
#endif // __uPD71054_TIMER
/* 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, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(jjsquawk)
- MDRV_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(jjsquawk)
+ MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer2, layer1 */
- MDRV_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */
+ MCFG_PALETTE_INIT(jjsquawk) /* layers are 6 planes deep */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -7839,40 +7839,40 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( msgundam, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(msgundam_map)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(msgundam_map)
#if __uPD71054_TIMER
- MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
+ MCFG_CPU_VBLANK_INT("screen", wrofaero_interrupt)
#else
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
#endif // __uPD71054_TIMER
#if __uPD71054_TIMER
- MDRV_MACHINE_START( wrofaero )
+ MCFG_MACHINE_START( wrofaero )
#endif // __uPD71054_TIMER
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56.66) /* between 56 and 57 to match a real PCB's game speed */
- 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, 48*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56.66) /* between 56 and 57 to match a real PCB's game speed */
+ 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, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_EOF(seta_buffer_sprites) /* msgundam uses sprite buffering */
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_EOF(seta_buffer_sprites) /* msgundam uses sprite buffering */
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7884,31 +7884,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( oisipuzl, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(oisipuzl_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(oisipuzl_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
- MDRV_VIDEO_START(oisipuzl_2_layers) // flip is inverted for the tilemaps
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(oisipuzl_2_layers) // flip is inverted for the tilemaps
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -7920,30 +7920,30 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( triplfun, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(triplfun_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(triplfun_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
- MDRV_VIDEO_START(oisipuzl_2_layers) // flip is inverted for the tilemaps
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(oisipuzl_2_layers) // flip is inverted for the tilemaps
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 792000, 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("oki", 792000, 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
/***************************************************************************
@@ -7953,32 +7953,32 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kiwame, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(kiwame_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* lev 1-7 are the same. WARNING:
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(kiwame_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* lev 1-7 are the same. WARNING:
the interrupt table is written to. */
/* 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, 56*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 56*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7992,31 +7992,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rezon, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8030,98 +8030,98 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( thunderl, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(thunderl_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(thunderl_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wiggie, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(wiggie_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(wiggie_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(wiggie_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(wiggie_sound_map)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(wiggie)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(wiggie)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( superbar, wiggie )
- MDRV_GFXDECODE(superbar)
+ MCFG_GFXDECODE(superbar)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wits, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(thunderl_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(thunderl_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8132,31 +8132,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( umanclub, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(umanclub_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(umanclub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8167,40 +8167,40 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( utoukond, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(utoukond_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(utoukond_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
- MDRV_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(utoukond_sound_map)
- MDRV_CPU_IO_MAP(utoukond_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(utoukond_sound_map)
+ MCFG_CPU_IO_MAP(utoukond_sound_io_map)
/* 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, 48*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer2, layer1 */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000)
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("ymsnd", YM3438, 16000000/4) /* 4 MHz */
- MDRV_SOUND_CONFIG(utoukond_ym3438_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM3438, 16000000/4) /* 4 MHz */
+ MCFG_SOUND_CONFIG(utoukond_ym3438_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
@@ -8211,39 +8211,39 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wrofaero, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(wrofaero_map)
#if __uPD71054_TIMER
- MDRV_CPU_VBLANK_INT("screen", wrofaero_interrupt)
+ MCFG_CPU_VBLANK_INT("screen", wrofaero_interrupt)
#else
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
#endif // __uPD71054_TIMER
#if __uPD71054_TIMER
- MDRV_MACHINE_START( wrofaero )
+ MCFG_MACHINE_START( wrofaero )
#endif // __uPD71054_TIMER
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(msgundam)
- MDRV_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */
+ MCFG_GFXDECODE(msgundam)
+ MCFG_PALETTE_LENGTH(512 * 3) /* sprites, layer1, layer2 */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8261,32 +8261,32 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( zingzip, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(wrofaero_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(zingzip)
- MDRV_PALETTE_LENGTH(16*32+16*32+64*32*2) /* sprites, layer2, layer1 */
+ MCFG_GFXDECODE(zingzip)
+ MCFG_PALETTE_LENGTH(16*32+16*32+64*32*2) /* sprites, layer2, layer1 */
- MDRV_PALETTE_INIT(zingzip) /* layer 1 gfx is 6 planes deep */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_PALETTE_INIT(zingzip) /* layer 1 gfx is 6 planes deep */
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -8296,31 +8296,31 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pairlove, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(pairlove_map)
- MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(pairlove_map)
+ MCFG_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
/* 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, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tndrcade)
- MDRV_PALETTE_LENGTH(2048) /* sprites only */
+ MCFG_GFXDECODE(tndrcade)
+ MCFG_PALETTE_LENGTH(2048) /* sprites only */
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8340,33 +8340,33 @@ static INTERRUPT_GEN( crazyfgt_interrupt )
static MACHINE_CONFIG_START( crazyfgt, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(crazyfgt_map)
- MDRV_CPU_VBLANK_INT_HACK(crazyfgt_interrupt,1+5)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(crazyfgt_map)
+ MCFG_CPU_VBLANK_INT_HACK(crazyfgt_interrupt,1+5)
/* 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, 48*8-1, 2*8-4, 30*8-1-4)
+ 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, 48*8-1, 2*8-4, 30*8-1-4)
- MDRV_GFXDECODE(crazyfgt)
- MDRV_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer1, layer2 */
+ MCFG_GFXDECODE(crazyfgt)
+ MCFG_PALETTE_LENGTH(16*32+64*32*4) /* sprites, layer1, layer2 */
- MDRV_PALETTE_INIT(gundhara) /* layers are 6 planes deep (but have only 4 palettes) */
- MDRV_VIDEO_START(seta_2_layers)
- MDRV_VIDEO_UPDATE(seta)
+ MCFG_PALETTE_INIT(gundhara) /* layers are 6 planes deep (but have only 4 palettes) */
+ MCFG_VIDEO_START(seta_2_layers)
+ MCFG_VIDEO_UPDATE(seta)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 16000000/4) /* 4 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 16000000/4) /* 4 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
@@ -8430,43 +8430,43 @@ static const pia6821_interface inttoote_pia1_intf =
static MACHINE_CONFIG_START( inttoote, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(inttoote_map)
- MDRV_CPU_VBLANK_INT_HACK(inttoote_interrupt,8+1+1+1)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(inttoote_map)
+ MCFG_CPU_VBLANK_INT_HACK(inttoote_interrupt,8+1+1+1)
- MDRV_PIA6821_ADD("pia0", inttoote_pia0_intf)
- MDRV_PIA6821_ADD("pia1", inttoote_pia1_intf)
+ MCFG_PIA6821_ADD("pia0", inttoote_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", inttoote_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(inttoote)
- MDRV_PALETTE_LENGTH(512 * 1)
+ MCFG_GFXDECODE(inttoote)
+ MCFG_PALETTE_LENGTH(512 * 1)
- MDRV_PALETTE_INIT(inttoote)
- MDRV_VIDEO_START(seta_1_layer)
- MDRV_VIDEO_UPDATE(inttoote)
+ MCFG_PALETTE_INIT(inttoote)
+ MCFG_VIDEO_START(seta_1_layer)
+ MCFG_VIDEO_UPDATE(inttoote)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 16000000)
- MDRV_SOUND_CONFIG(seta_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
+ MCFG_SOUND_CONFIG(seta_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* devices */
- MDRV_MSM6242_ADD("rtc")
+ MCFG_MSM6242_ADD("rtc")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jockeyc, inttoote )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jockeyc_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(jockeyc_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index c1db20aa507..7ae1faa36c9 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -2281,123 +2281,123 @@ static const x1_010_interface x1_010_sound_intf =
static MACHINE_CONFIG_START( mj4simai, seta2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,50000000/3) /* !! TMP68301 @ 16.666666MHz !! */
- MDRV_CPU_PROGRAM_MAP(mj4simai_map)
- MDRV_CPU_VBLANK_INT("screen", seta2_interrupt)
+ MCFG_CPU_ADD("maincpu",M68000,50000000/3) /* !! TMP68301 @ 16.666666MHz !! */
+ MCFG_CPU_PROGRAM_MAP(mj4simai_map)
+ MCFG_CPU_VBLANK_INT("screen", seta2_interrupt)
- MDRV_MACHINE_START( tmp68301 )
- MDRV_MACHINE_RESET( tmp68301 )
+ MCFG_MACHINE_START( tmp68301 )
+ MCFG_MACHINE_RESET( tmp68301 )
/* 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(0x200, 0x200)
- MDRV_SCREEN_VISIBLE_AREA(0x40, 0x1c0-1, 0x80, 0x170-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(0x200, 0x200)
+ MCFG_SCREEN_VISIBLE_AREA(0x40, 0x1c0-1, 0x80, 0x170-1)
- MDRV_GFXDECODE(seta2)
- MDRV_PALETTE_LENGTH(0x8000+0xf0) /* extra 0xf0 because we might draw 256-color object with 16-color granularity */
+ MCFG_GFXDECODE(seta2)
+ MCFG_PALETTE_LENGTH(0x8000+0xf0) /* extra 0xf0 because we might draw 256-color object with 16-color granularity */
- MDRV_VIDEO_START(seta2)
- MDRV_VIDEO_UPDATE(seta2)
- MDRV_VIDEO_EOF(seta2)
+ MCFG_VIDEO_START(seta2)
+ MCFG_VIDEO_UPDATE(seta2)
+ MCFG_VIDEO_EOF(seta2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("x1snd", X1_010, 50000000/3)
- MDRV_SOUND_CONFIG(x1_010_sound_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("x1snd", X1_010, 50000000/3)
+ MCFG_SOUND_CONFIG(x1_010_sound_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gundamex, mj4simai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gundamex_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gundamex_map)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0x00, 0x180-1, 0x100, 0x1e0-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0x00, 0x180-1, 0x100, 0x1e0-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( grdians, mj4simai )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(grdians_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(grdians_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x130 -1, 0x80, 0x80 + 0xe8 -1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0x80, 0x80 + 0x130 -1, 0x80, 0x80 + 0xe8 -1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( myangel, mj4simai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(myangel_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(myangel_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x00, 0xf0-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x00, 0xf0-1)
- MDRV_VIDEO_START(seta2_offset)
+ MCFG_VIDEO_START(seta2_offset)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( myangel2, mj4simai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(myangel2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(myangel2_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x00, 0xf0-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x178-1, 0x00, 0xf0-1)
- MDRV_VIDEO_START(seta2_offset)
+ MCFG_VIDEO_START(seta2_offset)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pzlbowl, mj4simai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pzlbowl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pzlbowl_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0x10, 0x190-1, 0x100, 0x1f0-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0x10, 0x190-1, 0x100, 0x1f0-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( penbros, mj4simai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(penbros_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(penbros_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0x80, 0x160-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0x80, 0x160-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( samshoot, mj4simai )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(samshoot_map)
- MDRV_CPU_VBLANK_INT_HACK(samshoot_interrupt,2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(samshoot_map)
+ MCFG_CPU_VBLANK_INT_HACK(samshoot_interrupt,2)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0x40, 0x180-1, 0x40, 0x130-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0x40, 0x180-1, 0x40, 0x130-1)
MACHINE_CONFIG_END
@@ -2453,33 +2453,33 @@ static MACHINE_RESET( funcube )
static MACHINE_CONFIG_START( funcube, seta2_state )
- MDRV_CPU_ADD("maincpu", M68040, XTAL_25_447MHz) // !! XCF5206 actually !!
- MDRV_CPU_PROGRAM_MAP(funcube_map)
- MDRV_CPU_VBLANK_INT_HACK(funcube_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL_25_447MHz) // !! XCF5206 actually !!
+ MCFG_CPU_PROGRAM_MAP(funcube_map)
+ MCFG_CPU_VBLANK_INT_HACK(funcube_interrupt,2)
- MDRV_CPU_ADD("sub", H83007, FUNCUBE_SUB_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(funcube_sub_map)
- MDRV_CPU_IO_MAP(funcube_sub_io)
- MDRV_CPU_PERIODIC_INT(funcube_sub_timer_irq, 60*10 )
+ MCFG_CPU_ADD("sub", H83007, FUNCUBE_SUB_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(funcube_sub_map)
+ MCFG_CPU_IO_MAP(funcube_sub_io)
+ MCFG_CPU_PERIODIC_INT(funcube_sub_timer_irq, 60*10 )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_RESET( funcube )
+ MCFG_MACHINE_RESET( funcube )
/* 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(0x200, 0x200)
- MDRV_SCREEN_VISIBLE_AREA(0x0, 0x140-1, 0x80, 0x170-1)
-
- MDRV_GFXDECODE(funcube)
- MDRV_PALETTE_LENGTH(0x8000+0xf0) /* extra 0xf0 because we might draw 256-color object with 16-color granularity */
-
- MDRV_VIDEO_START(seta2)
- MDRV_VIDEO_UPDATE(seta2)
- MDRV_VIDEO_EOF(seta2)
+ 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(0x200, 0x200)
+ MCFG_SCREEN_VISIBLE_AREA(0x0, 0x140-1, 0x80, 0x170-1)
+
+ MCFG_GFXDECODE(funcube)
+ MCFG_PALETTE_LENGTH(0x8000+0xf0) /* extra 0xf0 because we might draw 256-color object with 16-color granularity */
+
+ MCFG_VIDEO_START(seta2)
+ MCFG_VIDEO_UPDATE(seta2)
+ MCFG_VIDEO_EOF(seta2)
/* sound hardware */
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index abc124030be..230c6220b79 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -829,77 +829,77 @@ static MACHINE_RESET( sf )
static MACHINE_CONFIG_START( sf, sf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ? (xtal is 16MHz) */
- MDRV_CPU_PROGRAM_MAP(sf_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ? (xtal is 16MHz) */
+ MCFG_CPU_PROGRAM_MAP(sf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? xtal is 3.579545MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* ? xtal is 3.579545MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* NMIs are caused by the main CPU */
- MDRV_MACHINE_START(sf)
- MDRV_MACHINE_RESET(sf)
+ MCFG_MACHINE_START(sf)
+ MCFG_MACHINE_RESET(sf)
- MDRV_CPU_ADD("audio2", Z80, 3579545) /* ? xtal is 3.579545MHz */
- MDRV_CPU_PROGRAM_MAP(sound2_map)
- MDRV_CPU_IO_MAP(sound2_io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,8000)
+ MCFG_CPU_ADD("audio2", Z80, 3579545) /* ? xtal is 3.579545MHz */
+ MCFG_CPU_PROGRAM_MAP(sound2_map)
+ MCFG_CPU_IO_MAP(sound2_io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,8000)
/* 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(8*8, (64-8)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(sf)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(sf)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(sf)
- MDRV_VIDEO_UPDATE(sf)
+ MCFG_VIDEO_START(sf)
+ MCFG_VIDEO_UPDATE(sf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
-
- MDRV_SOUND_ADD("msm1", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("msm2", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
+
+ MCFG_SOUND_ADD("msm1", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sfus, sf )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sfus_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sfus_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sfjp, sf )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sfjp_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sfjp_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sfp, sf )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c
index 115730a6db5..6590267f494 100644
--- a/src/mame/drivers/sfbonus.c
+++ b/src/mame/drivers/sfbonus.c
@@ -1247,35 +1247,35 @@ static NVRAM_HANDLER( sfbonus )
static MACHINE_CONFIG_START( sfbonus, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, 6000000) // custom packaged z80 CPU ?? Mhz
- MDRV_CPU_PROGRAM_MAP(sfbonus_map)
- MDRV_CPU_IO_MAP(sfbonus_io)
- MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
- //MDRV_CPU_PERIODIC_INT(nmi_line_pulse,100)
+ MCFG_CPU_ADD("maincpu", Z80, 6000000) // custom packaged z80 CPU ?? Mhz
+ MCFG_CPU_PROGRAM_MAP(sfbonus_map)
+ MCFG_CPU_IO_MAP(sfbonus_io)
+ MCFG_CPU_VBLANK_INT("screen",irq0_line_hold)
+ //MCFG_CPU_PERIODIC_INT(nmi_line_pulse,100)
- MDRV_MACHINE_RESET( sfbonus )
+ MCFG_MACHINE_RESET( sfbonus )
- MDRV_NVRAM_HANDLER(sfbonus)
+ MCFG_NVRAM_HANDLER(sfbonus)
- MDRV_GFXDECODE(sfbonus)
+ MCFG_GFXDECODE(sfbonus)
- 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*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 288-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(128*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 288-1)
- MDRV_PALETTE_LENGTH(0x100*2) // *2 for priority workaraound / custom drawing
+ MCFG_PALETTE_LENGTH(0x100*2) // *2 for priority workaraound / custom drawing
- MDRV_VIDEO_START(sfbonus)
- MDRV_VIDEO_UPDATE(sfbonus)
+ MCFG_VIDEO_START(sfbonus)
+ MCFG_VIDEO_UPDATE(sfbonus)
/* Parrot 3 seems fine at 1 Mhz, but Double Challenge isn't? */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sfcbox.c b/src/mame/drivers/sfcbox.c
index 025297afe8f..25101584092 100644
--- a/src/mame/drivers/sfcbox.c
+++ b/src/mame/drivers/sfcbox.c
@@ -209,30 +209,30 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( snes, snes_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
- MDRV_CPU_PROGRAM_MAP(snes_map)
+ MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
+ MCFG_CPU_PROGRAM_MAP(snes_map)
- MDRV_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */
- MDRV_CPU_PROGRAM_MAP(spc_mem)
+ MCFG_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */
+ MCFG_CPU_PROGRAM_MAP(spc_mem)
- MDRV_QUANTUM_TIME(HZ(24000))
+ MCFG_QUANTUM_TIME(HZ(24000))
- MDRV_MACHINE_START( snes )
- MDRV_MACHINE_RESET( snes )
+ MCFG_MACHINE_START( snes )
+ MCFG_MACHINE_RESET( snes )
/* video hardware */
- MDRV_VIDEO_START( snes )
- MDRV_VIDEO_UPDATE( snes )
+ MCFG_VIDEO_START( snes )
+ MCFG_VIDEO_UPDATE( snes )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("spc700", SNES, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("spc700", SNES, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sfcbox, snes )
diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c
index 1f9abe90520..96ca985fe6a 100644
--- a/src/mame/drivers/sfkick.c
+++ b/src/mame/drivers/sfkick.c
@@ -459,42 +459,42 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( sfkick, driver_device )
- MDRV_CPU_ADD("maincpu",Z80,MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(sfkick_map)
- MDRV_CPU_IO_MAP(sfkick_io_map)
- MDRV_CPU_VBLANK_INT_HACK(sfkick_interrupt,262)
+ MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/6)
+ MCFG_CPU_PROGRAM_MAP(sfkick_map)
+ MCFG_CPU_IO_MAP(sfkick_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(sfkick_interrupt,262)
- MDRV_QUANTUM_TIME(HZ(60000))
+ MCFG_QUANTUM_TIME(HZ(60000))
- MDRV_CPU_ADD("soundcpu",Z80,MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(sfkick_sound_map)
- MDRV_CPU_IO_MAP(sfkick_sound_io_map)
+ MCFG_CPU_ADD("soundcpu",Z80,MASTER_CLOCK/6)
+ MCFG_CPU_PROGRAM_MAP(sfkick_sound_map)
+ MCFG_CPU_IO_MAP(sfkick_sound_io_map)
- 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(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS)
- MDRV_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1)
+ 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(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS)
+ MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_intf )
- MDRV_MACHINE_RESET(sfkick)
+ MCFG_MACHINE_RESET(sfkick)
- MDRV_PALETTE_INIT( v9938 )
+ MCFG_PALETTE_INIT( v9938 )
- MDRV_VIDEO_START(sfkick)
- MDRV_VIDEO_UPDATE(generic_bitmapped)
+ MCFG_VIDEO_START(sfkick)
+ MCFG_VIDEO_UPDATE(generic_bitmapped)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/6)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/6)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index 320bd4f4c36..929f0ab3826 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -265,25 +265,25 @@ static I8255A_INTERFACE( ppi8255_intf )
static MACHINE_CONFIG_START( sg1000a, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(program_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", sg1000a_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(program_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", sg1000a_interrupt)
- MDRV_I8255A_ADD( "ppi8255", ppi8255_intf )
+ MCFG_I8255A_ADD( "ppi8255", ppi8255_intf )
/* video hardware */
- MDRV_FRAGMENT_ADD(tms9928a)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE((float)XTAL_10_738635MHz/2/342/262)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(4395)) /* 69 lines */
+ MCFG_FRAGMENT_ADD(tms9928a)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE((float)XTAL_10_738635MHz/2/342/262)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(4395)) /* 69 lines */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76489, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76489, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 17758903ab2..358e7c36574 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -558,35 +558,35 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( shadfrce, shadfrce_state )
- MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(shadfrce_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", shadfrce_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(shadfrce_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", shadfrce_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(shadfrce_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(shadfrce_sound_map)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 432, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 432, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
- MDRV_GFXDECODE(shadfrce)
- MDRV_PALETTE_LENGTH(0x4000)
+ MCFG_GFXDECODE(shadfrce)
+ MCFG_PALETTE_LENGTH(0x4000)
- MDRV_VIDEO_START(shadfrce)
- MDRV_VIDEO_EOF(shadfrce)
- MDRV_VIDEO_UPDATE(shadfrce)
+ MCFG_VIDEO_START(shadfrce)
+ MCFG_VIDEO_EOF(shadfrce)
+ MCFG_VIDEO_UPDATE(shadfrce)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_OKIM6295_ADD("oki", XTAL_13_4952MHz/8, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", XTAL_13_4952MHz/8, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
/* Rom Defs. */
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 866130c663e..c170dee2a3e 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -470,115 +470,115 @@ static const ym3438_interface ym3438_config =
static MACHINE_CONFIG_START( shangha3, shangha3_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(shangha3_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(shangha3_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(24*16, 16*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
+ 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(24*16, 16*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
- MDRV_GFXDECODE(shangha3)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(shangha3)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(shangha3)
- MDRV_VIDEO_UPDATE(shangha3)
+ MCFG_VIDEO_START(shangha3)
+ MCFG_VIDEO_UPDATE(shangha3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- 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( heberpop, shangha3_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(heberpop_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(heberpop_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(heberpop_sound_map)
- MDRV_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
+ MCFG_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(heberpop_sound_map)
+ MCFG_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(24*16, 16*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
+ 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(24*16, 16*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
- MDRV_GFXDECODE(shangha3)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(shangha3)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(shangha3)
- MDRV_VIDEO_UPDATE(shangha3)
+ MCFG_VIDEO_START(shangha3)
+ MCFG_VIDEO_UPDATE(shangha3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3438, 8000000)
- MDRV_SOUND_CONFIG(ym3438_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM3438, 8000000)
+ MCFG_SOUND_CONFIG(ym3438_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
- 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( blocken, shangha3_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(blocken_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(blocken_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(heberpop_sound_map)
- MDRV_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
+ MCFG_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(heberpop_sound_map)
+ MCFG_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(24*16, 16*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
+ 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(24*16, 16*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1)
- MDRV_GFXDECODE(shangha3)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(shangha3)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(shangha3)
- MDRV_VIDEO_UPDATE(shangha3)
+ MCFG_VIDEO_START(shangha3)
+ MCFG_VIDEO_UPDATE(shangha3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3438, 8000000)
- MDRV_SOUND_CONFIG(ym3438_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.40)
- MDRV_SOUND_ROUTE(1, "mono", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM3438, 8000000)
+ MCFG_SOUND_CONFIG(ym3438_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.40)
+ MCFG_SOUND_ROUTE(1, "mono", 0.40)
- 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/shanghai.c b/src/mame/drivers/shanghai.c
index ef96644db54..32eedde57dd 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -427,109 +427,109 @@ static const hd63484_interface shanghai_hd63484_intf = { 0 };
static MACHINE_CONFIG_START( shanghai, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,16000000/2) /* ? */
- MDRV_CPU_PROGRAM_MAP(shanghai_map)
- MDRV_CPU_IO_MAP(shanghai_portmap)
- MDRV_CPU_VBLANK_INT("screen", shanghai_interrupt)
+ MCFG_CPU_ADD("maincpu", V30,16000000/2) /* ? */
+ MCFG_CPU_PROGRAM_MAP(shanghai_map)
+ MCFG_CPU_IO_MAP(shanghai_portmap)
+ MCFG_CPU_VBLANK_INT("screen", shanghai_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 280)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1) // Base Screen is 384 pixel
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 280)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1) // Base Screen is 384 pixel
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(shanghai)
- MDRV_VIDEO_START(shanghai)
- MDRV_VIDEO_UPDATE(shanghai)
+ MCFG_PALETTE_INIT(shanghai)
+ MCFG_VIDEO_START(shanghai)
+ MCFG_VIDEO_UPDATE(shanghai)
- MDRV_HD63484_ADD("hd63484", shanghai_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", shanghai_hd63484_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, 16000000/4)
- MDRV_SOUND_CONFIG(sh_ym2203_interface)
- 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.80)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, 16000000/4)
+ MCFG_SOUND_CONFIG(sh_ym2203_interface)
+ 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.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( shangha2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,16000000/2) /* ? */
- MDRV_CPU_PROGRAM_MAP(shangha2_map)
- MDRV_CPU_IO_MAP(shangha2_portmap)
- MDRV_CPU_VBLANK_INT("screen", shanghai_interrupt)
+ MCFG_CPU_ADD("maincpu", V30,16000000/2) /* ? */
+ MCFG_CPU_PROGRAM_MAP(shangha2_map)
+ MCFG_CPU_IO_MAP(shangha2_portmap)
+ MCFG_CPU_VBLANK_INT("screen", shanghai_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 280)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1) // Base Screen is 384 pixel
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 280)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1) // Base Screen is 384 pixel
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(shanghai)
- MDRV_VIDEO_UPDATE(shanghai)
+ MCFG_VIDEO_START(shanghai)
+ MCFG_VIDEO_UPDATE(shanghai)
- MDRV_HD63484_ADD("hd63484", shanghai_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", shanghai_hd63484_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, 16000000/4)
- MDRV_SOUND_CONFIG(sh_ym2203_interface)
- 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.80)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, 16000000/4)
+ MCFG_SOUND_CONFIG(sh_ym2203_interface)
+ 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.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kothello, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30,16000000/2) /* ? */
- MDRV_CPU_PROGRAM_MAP(kothello_map)
- MDRV_CPU_VBLANK_INT("screen", shanghai_interrupt)
+ MCFG_CPU_ADD("maincpu", V30,16000000/2) /* ? */
+ MCFG_CPU_PROGRAM_MAP(kothello_map)
+ MCFG_CPU_VBLANK_INT("screen", shanghai_interrupt)
SEIBU3A_SOUND_SYSTEM_CPU(14318180/4)
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 280)
- MDRV_SCREEN_VISIBLE_AREA(8, 384-1, 0, 250-1) // Base Screen is 376 pixel
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 280)
+ MCFG_SCREEN_VISIBLE_AREA(8, 384-1, 0, 250-1) // Base Screen is 376 pixel
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(shanghai)
- MDRV_VIDEO_UPDATE(shanghai)
+ MCFG_VIDEO_START(shanghai)
+ MCFG_VIDEO_UPDATE(shanghai)
- MDRV_HD63484_ADD("hd63484", shanghai_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", shanghai_hd63484_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* same as standard seibu ym2203, but "ym1" also reads "DSW" */
- MDRV_SOUND_ADD("ym1", YM2203, 14318180/4)
- MDRV_SOUND_CONFIG(kothello_ym2203_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ym1", YM2203, 14318180/4)
+ MCFG_SOUND_CONFIG(kothello_ym2203_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ym2", YM2203, 14318180/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ym2", YM2203, 14318180/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
SEIBU_SOUND_SYSTEM_ADPCM_INTERFACE
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 0ad125cd6d8..1da2a74353b 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -366,70 +366,70 @@ static const ay8910_interface shangkid_ay8910_interface =
static MACHINE_CONFIG_START( chinhero, shangkid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(chinhero_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(chinhero_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("bbx", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(chinhero_bbx_map)
- MDRV_CPU_IO_MAP(chinhero_bbx_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("bbx", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(chinhero_bbx_map)
+ MCFG_CPU_IO_MAP(chinhero_bbx_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(chinhero_sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(chinhero_sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_RESET(chinhero)
+ MCFG_MACHINE_RESET(chinhero)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* 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(40*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(16, 319-16, 0, 223)
+ 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(40*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(16, 319-16, 0, 223)
- MDRV_GFXDECODE(chinhero)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(chinhero)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(shangkid)
- MDRV_VIDEO_UPDATE(shangkid)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(shangkid)
+ MCFG_VIDEO_UPDATE(shangkid)
/* 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.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_SOUND_CONFIG(chinhero_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_CONFIG(chinhero_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( shangkid, chinhero )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shangkid_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(shangkid_main_map)
- MDRV_CPU_MODIFY("bbx")
- MDRV_CPU_PROGRAM_MAP(shangkid_bbx_map)
- MDRV_CPU_IO_MAP(shangkid_bbx_portmap)
+ MCFG_CPU_MODIFY("bbx")
+ MCFG_CPU_PROGRAM_MAP(shangkid_bbx_map)
+ MCFG_CPU_IO_MAP(shangkid_bbx_portmap)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(shangkid_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(shangkid_sound_map)
- MDRV_MACHINE_RESET(shangkid)
+ MCFG_MACHINE_RESET(shangkid)
/* video hardware */
- MDRV_GFXDECODE(shangkid)
+ MCFG_GFXDECODE(shangkid)
- MDRV_SOUND_MODIFY("aysnd")
- MDRV_SOUND_CONFIG(shangkid_ay8910_interface)
+ MCFG_SOUND_MODIFY("aysnd")
+ MCFG_SOUND_CONFIG(shangkid_ay8910_interface)
MACHINE_CONFIG_END
@@ -458,30 +458,30 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_START( dynamski, shangkid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(dynamski_map)
- MDRV_CPU_IO_MAP(dynamski_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(dynamski_map)
+ MCFG_CPU_IO_MAP(dynamski_portmap)
+ 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256+32, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255+32, 16, 255-16)
+ 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(256+32, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255+32, 16, 255-16)
- MDRV_GFXDECODE(dynamski)
- MDRV_PALETTE_LENGTH(16*4+16*4)
+ MCFG_GFXDECODE(dynamski)
+ MCFG_PALETTE_LENGTH(16*4+16*4)
- MDRV_PALETTE_INIT(dynamski)
- MDRV_VIDEO_UPDATE(dynamski)
+ MCFG_PALETTE_INIT(dynamski)
+ MCFG_VIDEO_UPDATE(dynamski)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
/***************************************************************************************/
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index 0e99cb49f55..d8643923b4c 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -191,43 +191,43 @@ GFXDECODE_END
static MACHINE_CONFIG_START( shaolins, shaolins_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(shaolins_map)
- MDRV_CPU_VBLANK_INT_HACK(shaolins_interrupt,16) /* 1 IRQ + 8 NMI */
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(shaolins_map)
+ MCFG_CPU_VBLANK_INT_HACK(shaolins_interrupt,16) /* 1 IRQ + 8 NMI */
/* 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)
+ 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)
- MDRV_GFXDECODE(shaolins)
- MDRV_PALETTE_LENGTH(16*8*16+16*8*16)
+ MCFG_GFXDECODE(shaolins)
+ MCFG_PALETTE_LENGTH(16*8*16+16*8*16)
- MDRV_PALETTE_INIT(shaolins)
- MDRV_VIDEO_START(shaolins)
- MDRV_VIDEO_UPDATE(shaolins)
+ MCFG_PALETTE_INIT(shaolins)
+ MCFG_VIDEO_START(shaolins)
+ MCFG_VIDEO_UPDATE(shaolins)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489A, MASTER_CLOCK/12) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76489A, MASTER_CLOCK/12) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76489A, MASTER_CLOCK/6) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76489A, MASTER_CLOCK/6) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
#if 0 // a bootleg board was found with downgraded sound hardware, but is otherwise the same
static MACHINE_CONFIG_DERIVED( shaolinb, shaolins )
- MDRV_SOUND_REPLACE("sn1", SN76489, MASTER_CLOCK/12) /* only type verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("sn1", SN76489, MASTER_CLOCK/12) /* only type verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_REPLACE("sn2", SN76489, MASTER_CLOCK/6) /* only type verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("sn2", SN76489, MASTER_CLOCK/6) /* only type verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index 82406a2673a..ff7d539b9da 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -212,45 +212,45 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( shisen, shisen_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz ? */
- MDRV_CPU_PROGRAM_MAP(shisen_map)
- MDRV_CPU_IO_MAP(shisen_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- MDRV_CPU_ADD("soundcpu", Z80, 3579645)
- MDRV_CPU_PROGRAM_MAP(shisen_sound_map)
- MDRV_CPU_IO_MAP(shisen_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
+ MCFG_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(shisen_map)
+ MCFG_CPU_IO_MAP(shisen_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ MCFG_CPU_ADD("soundcpu", Z80, 3579645)
+ MCFG_CPU_PROGRAM_MAP(shisen_sound_map)
+ MCFG_CPU_IO_MAP(shisen_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- 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, 64*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ 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, 64*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(shisen)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(shisen)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(sichuan2)
- MDRV_VIDEO_UPDATE(sichuan2)
+ MCFG_VIDEO_START(sichuan2)
+ MCFG_VIDEO_UPDATE(sichuan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.5)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.5)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 8d819e1e3d7..38142cf8fcb 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -263,63 +263,63 @@ static const ym2203_interface ym2203_interface2 =
static MACHINE_CONFIG_START( shootout, shootout_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz? */
- MDRV_CPU_PROGRAM_MAP(shootout_map)
+ MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz? */
+ MCFG_CPU_PROGRAM_MAP(shootout_map)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(shootout_sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(shootout_sound_map)
/* 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(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(shootout)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(shootout)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(shootout)
- MDRV_VIDEO_START(shootout)
- MDRV_VIDEO_UPDATE(shootout)
+ MCFG_PALETTE_INIT(shootout)
+ MCFG_VIDEO_START(shootout)
+ MCFG_VIDEO_UPDATE(shootout)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( shootouj, shootout_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz? */
- MDRV_CPU_PROGRAM_MAP(shootouj_map)
+ MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz? */
+ MCFG_CPU_PROGRAM_MAP(shootouj_map)
/* 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(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(shootout)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(shootout)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(shootout)
- MDRV_VIDEO_START(shootout)
- MDRV_VIDEO_UPDATE(shootouj)
+ MCFG_PALETTE_INIT(shootout)
+ MCFG_VIDEO_START(shootout)
+ MCFG_VIDEO_UPDATE(shootouj)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_interface2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_interface2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index 872ab0a58bc..268e9adf6ac 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -392,40 +392,40 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( shougi, shougi_state )
- MDRV_CPU_ADD("maincpu", Z80,10000000/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", shougi_vblank_nmi)
+ MCFG_CPU_ADD("maincpu", Z80,10000000/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", shougi_vblank_nmi)
- MDRV_CPU_ADD("sub", Z80,10000000/4)
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_IO_MAP(readport_sub)
+ MCFG_CPU_ADD("sub", Z80,10000000/4)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_IO_MAP(readport_sub)
/* NMIs triggered in shougi_vblank_nmi() */
/* MCU */
- MDRV_CPU_ADD("mcu", ALPHA8201, 10000000/4/8)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", ALPHA8201, 10000000/4/8)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_QUANTUM_TIME(HZ(600))
- MDRV_WATCHDOG_VBLANK_INIT(16) // assuming it's the same as champbas
+ MCFG_QUANTUM_TIME(HZ(600))
+ MCFG_WATCHDOG_VBLANK_INIT(16) // assuming it's the same as champbas
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 255)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 255)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(shougi)
- MDRV_VIDEO_UPDATE(shougi)
+ MCFG_PALETTE_INIT(shougi)
+ MCFG_VIDEO_UPDATE(shougi)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 10000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 10000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index 34194f9f223..6d920f81093 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -261,32 +261,32 @@ GFXDECODE_END
static MACHINE_CONFIG_START( shuuz, shuuz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(shuuz)
- MDRV_MACHINE_RESET(shuuz)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(shuuz)
+ MCFG_MACHINE_RESET(shuuz)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(shuuz)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(shuuz)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a VAD chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(shuuz)
- MDRV_VIDEO_UPDATE(shuuz)
+ MCFG_VIDEO_START(shuuz)
+ MCFG_VIDEO_UPDATE(shuuz)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 4e2fd6190ed..1defba66ccc 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -655,130 +655,130 @@ static const ym2151_interface whizz_ym2151_interface =
static MACHINE_CONFIG_START( sidearms, sidearms_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(sidearms_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(sidearms_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(sidearms_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(sidearms_sound_map)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
+ 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(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(sidearms)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(sidearms)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(sidearms)
- MDRV_VIDEO_EOF(sidearms)
- MDRV_VIDEO_UPDATE(sidearms)
+ MCFG_VIDEO_START(sidearms)
+ MCFG_VIDEO_EOF(sidearms)
+ MCFG_VIDEO_UPDATE(sidearms)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.25)
-
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- 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.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.25)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( turtship, sidearms_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(turtship_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(turtship_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(sidearms_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(sidearms_sound_map)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
+ 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(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(turtship)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(turtship)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(sidearms)
- MDRV_VIDEO_EOF(sidearms)
- MDRV_VIDEO_UPDATE(sidearms)
+ MCFG_VIDEO_START(sidearms)
+ MCFG_VIDEO_EOF(sidearms)
+ MCFG_VIDEO_UPDATE(sidearms)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.25)
-
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- 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.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.25)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( whizz, sidearms_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(whizz_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(whizz_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(whizz_sound_map)
- MDRV_CPU_IO_MAP(whizz_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(whizz_sound_map)
+ MCFG_CPU_IO_MAP(whizz_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(60000))
+ MCFG_QUANTUM_TIME(HZ(60000))
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
+ 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(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(turtship)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(turtship)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(sidearms)
- MDRV_VIDEO_UPDATE(sidearms)
- MDRV_VIDEO_EOF(sidearms)
+ MCFG_VIDEO_START(sidearms)
+ MCFG_VIDEO_UPDATE(sidearms)
+ MCFG_VIDEO_EOF(sidearms)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(whizz_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(whizz_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 5f39b112e56..edfbca284a5 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -262,38 +262,38 @@ static const ym3526_interface ym3526_config =
static MACHINE_CONFIG_START( sidepckt, sidepckt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(sidepckt_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(sidepckt_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* 1.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* 1.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main cpu */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* VERIFY: May be 55 or 56 */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* VERIFY: May be 55 or 56 */)
+ 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)
- MDRV_GFXDECODE(sidepckt)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(sidepckt)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(sidepckt)
- MDRV_VIDEO_START(sidepckt)
- MDRV_VIDEO_UPDATE(sidepckt)
+ MCFG_PALETTE_INIT(sidepckt)
+ MCFG_VIDEO_START(sidepckt)
+ MCFG_VIDEO_UPDATE(sidepckt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ym2", YM3526, 3000000)
- MDRV_SOUND_CONFIG(ym3526_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_SOUND_CONFIG(ym3526_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sigmab52.c b/src/mame/drivers/sigmab52.c
index 333ff41c6d3..f4557ec4a2b 100644
--- a/src/mame/drivers/sigmab52.c
+++ b/src/mame/drivers/sigmab52.c
@@ -567,33 +567,33 @@ static const hd63484_interface jwildb52_hd63484_intf = { 1 };
static MACHINE_CONFIG_START( jwildb52, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK/9) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(jwildb52_map)
- MDRV_CPU_VBLANK_INT("screen", timer_irq) /* Fix me */
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/9) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(jwildb52_map)
+ MCFG_CPU_VBLANK_INT("screen", timer_irq) /* Fix me */
#if 0
- MDRV_CPU_ADD("audiocpu", M6809, MAIN_CLOCK/9) /* 2 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_prog_map)
+ MCFG_CPU_ADD("audiocpu", M6809, MAIN_CLOCK/9) /* 2 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_prog_map)
//temporary teh same int as for main cpu
- MDRV_CPU_PERIODIC_INT(timer_irq, 1000) /* Fix me */
+ MCFG_CPU_PERIODIC_INT(timer_irq, 1000) /* Fix me */
#endif
- MDRV_MACHINE_START(jwildb52)
+ MCFG_MACHINE_START(jwildb52)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(30)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(1024, 1024)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 384-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(1024, 1024)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 384-1)
- MDRV_HD63484_ADD("hd63484", jwildb52_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", jwildb52_hd63484_intf)
- MDRV_PALETTE_INIT(jwildb52)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(jwildb52)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(jwildb52)
- MDRV_VIDEO_UPDATE(jwildb52)
+ MCFG_VIDEO_START(jwildb52)
+ MCFG_VIDEO_UPDATE(jwildb52)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c
index 4535a32ad4f..f9e4f2d34f4 100644
--- a/src/mame/drivers/sigmab98.c
+++ b/src/mame/drivers/sigmab98.c
@@ -463,34 +463,34 @@ static INTERRUPT_GEN( gegege_vblank_interrupt )
}
static MACHINE_CONFIG_START( gegege, driver_device )
- MDRV_CPU_ADD("maincpu", Z80, XTAL_27MHz / 4) // ?
- MDRV_CPU_PROGRAM_MAP(gegege_mem_map)
- MDRV_CPU_IO_MAP(gegege_io_map)
- MDRV_CPU_VBLANK_INT("screen", gegege_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_27MHz / 4) // ?
+ MCFG_CPU_PROGRAM_MAP(gegege_mem_map)
+ MCFG_CPU_IO_MAP(gegege_io_map)
+ MCFG_CPU_VBLANK_INT("screen", gegege_vblank_interrupt)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
- MDRV_TICKET_DISPENSER_ADD("hopper", 200, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW )
+ MCFG_TICKET_DISPENSER_ADD("hopper", 200, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW )
- 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(0x200, 0x200)
- MDRV_SCREEN_VISIBLE_AREA(0,0x140-1, 0,0xf0-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(0x200, 0x200)
+ MCFG_SCREEN_VISIBLE_AREA(0,0x140-1, 0,0xf0-1)
- MDRV_GFXDECODE(sigmab98)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(sigmab98)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_UPDATE(sigmab98)
+ MCFG_VIDEO_UPDATE(sigmab98)
// sound hardware
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_27MHz / 2) // ?
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_27MHz / 2) // ?
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index ee6d0795fd3..0f99ced1115 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -281,38 +281,38 @@ GFXDECODE_END
static MACHINE_CONFIG_START( silkroad, silkroad_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(cpu_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(6*8+2, 64*8-1-(10*8)-2, 2*8, 32*8-1-(2*8))
+ 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(6*8+2, 64*8-1-(10*8)-2, 2*8, 32*8-1-(2*8))
- MDRV_GFXDECODE(silkroad)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(silkroad)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(silkroad)
- MDRV_VIDEO_UPDATE(silkroad)
+ MCFG_VIDEO_START(silkroad)
+ MCFG_VIDEO_UPDATE(silkroad)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki1", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45)
+ MCFG_OKIM6295_ADD("oki1", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45)
+ MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index d3ec59bc035..a47d1876166 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -418,68 +418,68 @@ static const deco16ic_interface simpl156_deco16ic_intf =
static MACHINE_CONFIG_START( chainrec, simpl156_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */
- MDRV_CPU_PROGRAM_MAP(chainrec_map)
- MDRV_CPU_VBLANK_INT("screen", simpl156_vbl_interrupt)
+ MCFG_CPU_ADD("maincpu", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */
+ MCFG_CPU_PROGRAM_MAP(chainrec_map)
+ MCFG_CPU_VBLANK_INT("screen", simpl156_vbl_interrupt)
- MDRV_EEPROM_93C46_ADD("eeprom") // 93C45
+ MCFG_EEPROM_93C46_ADD("eeprom") // 93C45
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(800))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(800))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_GFXDECODE(simpl156)
- MDRV_VIDEO_START(simpl156)
- MDRV_VIDEO_UPDATE(simpl156)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(simpl156)
+ MCFG_VIDEO_START(simpl156)
+ MCFG_VIDEO_UPDATE(simpl156)
- MDRV_DECO16IC_ADD("deco_custom", simpl156_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", simpl156_deco16ic_intf)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("okisfx", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
+ MCFG_OKIM6295_ADD("okisfx", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
- MDRV_OKIM6295_ADD("okimusic", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2)
+ MCFG_OKIM6295_ADD("okimusic", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( magdrop, chainrec )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magdrop_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(magdrop_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( magdropp, chainrec )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(magdropp_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(magdropp_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( joemacr, chainrec )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(joemacr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(joemacr_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mitchell156, chainrec )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mitchell156_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mitchell156_map)
- MDRV_OKIM6295_REPLACE("okimusic", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2)
+ MCFG_OKIM6295_REPLACE("okimusic", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index d156c2991e2..7dc036b6c5a 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -308,49 +308,49 @@ static const eeprom_interface eeprom_intf =
static MACHINE_CONFIG_START( simpsons, simpsons_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* pin 18 of konami cpu is 12Mhz, while pin 17 is 3mhz. Clock probably divided internally by 4 */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* pin 18 of konami cpu is 12Mhz, while pin 17 is 3mhz. Clock probably divided internally by 4 */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(z80_map)
/* NMIs are generated by the 053260 */
- MDRV_MACHINE_START(simpsons)
- MDRV_MACHINE_RESET(simpsons)
+ MCFG_MACHINE_START(simpsons)
+ MCFG_MACHINE_RESET(simpsons)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.1856)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.1856)
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(simpsons)
+ MCFG_VIDEO_UPDATE(simpsons)
- MDRV_K052109_ADD("k052109", simpsons_k052109_intf)
- MDRV_K053246_ADD("k053246", simpsons_k053246_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", simpsons_k052109_intf)
+ MCFG_K053246_ADD("k053246", simpsons_k053246_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) /* only left channel is connected */
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) /* only left channel is connected */
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.0)
- MDRV_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c
index deeb2552a01..b0096ab9200 100644
--- a/src/mame/drivers/skeetsht.c
+++ b/src/mame/drivers/skeetsht.c
@@ -247,30 +247,30 @@ static const tms34010_config tms_config =
static MACHINE_CONFIG_START( skeetsht, skeetsht_state )
- MDRV_CPU_ADD("68hc11", MC68HC11, 4000000) // ?
- MDRV_CPU_PROGRAM_MAP(hc11_pgm_map)
- MDRV_CPU_IO_MAP(hc11_io_map)
- MDRV_CPU_CONFIG(skeetsht_hc11_config)
+ MCFG_CPU_ADD("68hc11", MC68HC11, 4000000) // ?
+ MCFG_CPU_PROGRAM_MAP(hc11_pgm_map)
+ MCFG_CPU_IO_MAP(hc11_io_map)
+ MCFG_CPU_CONFIG(skeetsht_hc11_config)
- MDRV_CPU_ADD("tms", TMS34010, 48000000)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_program_map)
+ MCFG_CPU_ADD("tms", TMS34010, 48000000)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(tms_program_map)
- MDRV_MACHINE_RESET(skeetsht)
+ MCFG_MACHINE_RESET(skeetsht)
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(48000000 / 8, 156*4, 0, 100*4, 328, 0, 300) // FIXME
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(48000000 / 8, 156*4, 0, 100*4, 328, 0, 300) // FIXME
- MDRV_VIDEO_START(skeetsht)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(skeetsht)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c
index 2e4333f405c..5114cb46f6f 100644
--- a/src/mame/drivers/skimaxx.c
+++ b/src/mame/drivers/skimaxx.c
@@ -504,51 +504,51 @@ static MACHINE_RESET( skimaxx )
*************************************/
static MACHINE_CONFIG_START( skimaxx, driver_device )
- MDRV_CPU_ADD("maincpu", M68EC030, XTAL_40MHz)
- MDRV_CPU_PROGRAM_MAP(68030_1_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold) // 1,3,7 are identical, rest is RTE
+ MCFG_CPU_ADD("maincpu", M68EC030, XTAL_40MHz)
+ MCFG_CPU_PROGRAM_MAP(68030_1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold) // 1,3,7 are identical, rest is RTE
- MDRV_CPU_ADD("subcpu", M68EC030, XTAL_40MHz)
- MDRV_CPU_PROGRAM_MAP(68030_2_map)
+ MCFG_CPU_ADD("subcpu", M68EC030, XTAL_40MHz)
+ MCFG_CPU_PROGRAM_MAP(68030_2_map)
- MDRV_MACHINE_RESET(skimaxx)
+ MCFG_MACHINE_RESET(skimaxx)
/* video hardware */
- MDRV_CPU_ADD("tms", TMS34010, XTAL_50MHz)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_program_map)
+ MCFG_CPU_ADD("tms", TMS34010, XTAL_50MHz)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(tms_program_map)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
-// MDRV_SCREEN_RAW_PARAMS(40000000/4, 156*4, 0, 100*4, 328, 0, 300) // TODO - Wrong but TMS overrides it anyway
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MDRV_SCREEN_SIZE(0x400, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x280-1, 0, 0xf0-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+// MCFG_SCREEN_RAW_PARAMS(40000000/4, 156*4, 0, 100*4, 328, 0, 300) // TODO - Wrong but TMS overrides it anyway
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_SIZE(0x400, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x280-1, 0, 0xf0-1)
- MDRV_VIDEO_START(skimaxx)
-// MDRV_VIDEO_UPDATE(tms340x0)
- MDRV_VIDEO_UPDATE(skimaxx)
+ MCFG_VIDEO_START(skimaxx)
+// MCFG_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_UPDATE(skimaxx)
-// MDRV_GFXDECODE( skimaxx )
+// MCFG_GFXDECODE( skimaxx )
- MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_INIT(RRRRR_GGGGG_BBBBB)
+ MCFG_PALETTE_LENGTH(32768)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", XTAL_4MHz, OKIM6295_PIN7_LOW) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", XTAL_4MHz, OKIM6295_PIN7_LOW) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", XTAL_4MHz/2, OKIM6295_PIN7_HIGH) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki2", XTAL_4MHz/2, OKIM6295_PIN7_HIGH) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki3", XTAL_4MHz, OKIM6295_PIN7_LOW) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki3", XTAL_4MHz, OKIM6295_PIN7_LOW) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki4", XTAL_4MHz/2, OKIM6295_PIN7_HIGH) // ?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki4", XTAL_4MHz/2, OKIM6295_PIN7_HIGH) // ?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index 5232fcb2ccd..162339aba86 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -256,30 +256,30 @@ GFXDECODE_END
static MACHINE_CONFIG_START( skullxbo, skullxbo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(skullxbo)
- MDRV_MACHINE_RESET(skullxbo)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(skullxbo)
+ MCFG_MACHINE_RESET(skullxbo)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(skullxbo)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(skullxbo)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
- MDRV_VIDEO_START(skullxbo)
- MDRV_VIDEO_UPDATE(skullxbo)
+ MCFG_VIDEO_START(skullxbo)
+ MCFG_VIDEO_UPDATE(skullxbo)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_ii_mono)
+ MCFG_FRAGMENT_ADD(jsa_ii_mono)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index be7aa4569e9..f081853fe87 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -273,31 +273,31 @@ GFXDECODE_END
static MACHINE_CONFIG_START( skyarmy, skyarmy_state )
- MDRV_CPU_ADD("maincpu", Z80,4000000)
- MDRV_CPU_PROGRAM_MAP(skyarmy_map)
- MDRV_CPU_IO_MAP(skyarmy_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_PERIODIC_INT(skyarmy_nmi_source,650) /* Hz */
+ MCFG_CPU_ADD("maincpu", Z80,4000000)
+ MCFG_CPU_PROGRAM_MAP(skyarmy_map)
+ MCFG_CPU_IO_MAP(skyarmy_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_PERIODIC_INT(skyarmy_nmi_source,650) /* Hz */
/* 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,1*8,31*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,32*8-1,1*8,31*8-1)
- MDRV_GFXDECODE(skyarmy)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(skyarmy)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(skyarmy)
- MDRV_VIDEO_START(skyarmy)
- MDRV_VIDEO_UPDATE(skyarmy)
+ MCFG_PALETTE_INIT(skyarmy)
+ MCFG_VIDEO_START(skyarmy)
+ MCFG_VIDEO_UPDATE(skyarmy)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 2500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index fecf0fdc7c9..f16f4a710a4 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -374,34 +374,34 @@ GFXDECODE_END
static MACHINE_CONFIG_START( skydiver, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800,MASTER_CLOCK/16) /* ???? */
- MDRV_CPU_PROGRAM_MAP(skydiver_map)
- MDRV_CPU_VBLANK_INT_HACK(skydiver_interrupt, 5)
- MDRV_WATCHDOG_VBLANK_INIT(8) // 128V clocks the same as VBLANK
+ MCFG_CPU_ADD("maincpu", M6800,MASTER_CLOCK/16) /* ???? */
+ MCFG_CPU_PROGRAM_MAP(skydiver_map)
+ MCFG_CPU_VBLANK_INT_HACK(skydiver_interrupt, 5)
+ MCFG_WATCHDOG_VBLANK_INIT(8) // 128V clocks the same as VBLANK
- MDRV_MACHINE_RESET(skydiver)
+ MCFG_MACHINE_RESET(skydiver)
/* 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(0*8, 32*8-1, 0*8, 28*8-1)
+ 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(0*8, 32*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(skydiver)
- MDRV_PALETTE_LENGTH(sizeof(colortable_source) / sizeof(colortable_source[0]))
+ MCFG_GFXDECODE(skydiver)
+ MCFG_PALETTE_LENGTH(sizeof(colortable_source) / sizeof(colortable_source[0]))
- MDRV_PALETTE_INIT(skydiver)
- MDRV_VIDEO_START(skydiver)
- MDRV_VIDEO_UPDATE(skydiver)
+ MCFG_PALETTE_INIT(skydiver)
+ MCFG_VIDEO_START(skydiver)
+ MCFG_VIDEO_UPDATE(skydiver)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(skydiver)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(skydiver)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 1adbec553c8..102f38cd75e 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -241,38 +241,38 @@ static MACHINE_RESET( skyfox )
static MACHINE_CONFIG_START( skyfox, skyfox_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* Verified at 4MHz */
- MDRV_CPU_PROGRAM_MAP(skyfox_map)
- MDRV_CPU_VBLANK_INT("screen", skyfox_interrupt) /* NMI caused by coin insertion */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* Verified at 4MHz */
+ MCFG_CPU_PROGRAM_MAP(skyfox_map)
+ MCFG_CPU_VBLANK_INT("screen", skyfox_interrupt) /* NMI caused by coin insertion */
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
- MDRV_CPU_PROGRAM_MAP(skyfox_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
+ MCFG_CPU_PROGRAM_MAP(skyfox_sound_map)
- MDRV_MACHINE_START(skyfox)
- MDRV_MACHINE_RESET(skyfox)
+ MCFG_MACHINE_START(skyfox)
+ MCFG_MACHINE_RESET(skyfox)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(62.65)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0+0x60, 320-1+0x60, 0+16, 256-1-16) // from $30*2 to $CC*2+8
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(62.65)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0+0x60, 320-1+0x60, 0+16, 256-1-16) // from $30*2 to $CC*2+8
- MDRV_GFXDECODE(skyfox)
- MDRV_PALETTE_LENGTH(256+256) /* 256 static colors (+256 for the background??) */
+ MCFG_GFXDECODE(skyfox)
+ MCFG_PALETTE_LENGTH(256+256) /* 256 static colors (+256 for the background??) */
- MDRV_PALETTE_INIT(skyfox)
- MDRV_VIDEO_UPDATE(skyfox)
+ MCFG_PALETTE_INIT(skyfox)
+ MCFG_VIDEO_UPDATE(skyfox)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_14_31818MHz/8) /* Verified at 1.789772MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 163bc415718..607d8e4ff81 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -428,40 +428,40 @@ static const namco_interface namco_config =
static MACHINE_CONFIG_START( skykid, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809,49152000/32)
- MDRV_CPU_PROGRAM_MAP(skykid_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", M6809,49152000/32)
+ MCFG_CPU_PROGRAM_MAP(skykid_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("mcu", HD63701,49152000/8) /* or compatible 6808 with extra instructions */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
- MDRV_CPU_IO_MAP(mcu_port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("mcu", HD63701,49152000/8) /* or compatible 6808 with extra instructions */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_IO_MAP(mcu_port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* we need heavy synch */
- MDRV_MACHINE_START(skykid)
+ MCFG_MACHINE_START(skykid)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(skykid)
- MDRV_PALETTE_LENGTH(64*4+128*4+64*8)
+ MCFG_GFXDECODE(skykid)
+ MCFG_PALETTE_LENGTH(64*4+128*4+64*8)
- MDRV_PALETTE_INIT(skykid)
- MDRV_VIDEO_START(skykid)
- MDRV_VIDEO_UPDATE(skykid)
+ MCFG_PALETTE_INIT(skykid)
+ MCFG_VIDEO_START(skykid)
+ MCFG_VIDEO_UPDATE(skykid)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index 3e9c50d85a2..f5a90d4ef3d 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -660,36 +660,36 @@ static INTERRUPT_GEN( skylncr_vblank_interrupt )
static MACHINE_CONFIG_START( skylncr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(mem_map_skylncr)
- MDRV_CPU_IO_MAP(io_map_skylncr)
- MDRV_CPU_VBLANK_INT("screen", skylncr_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(mem_map_skylncr)
+ MCFG_CPU_IO_MAP(io_map_skylncr)
+ MCFG_CPU_VBLANK_INT("screen", skylncr_vblank_interrupt)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* 1x M5M82C255, or 2x PPI8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-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-1)
- MDRV_GFXDECODE(skylncr)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(skylncr)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(skylncr)
- MDRV_VIDEO_UPDATE(skylncr)
+ MCFG_VIDEO_START(skylncr)
+ MCFG_VIDEO_UPDATE(skylncr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c
index 2bcb159ccc2..dba8dfd591d 100644
--- a/src/mame/drivers/skyraid.c
+++ b/src/mame/drivers/skyraid.c
@@ -222,33 +222,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( skyraid, skyraid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 12096000 / 12)
- MDRV_CPU_PROGRAM_MAP(skyraid_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_WATCHDOG_VBLANK_INIT(4)
+ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 12)
+ MCFG_CPU_PROGRAM_MAP(skyraid_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_WATCHDOG_VBLANK_INIT(4)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(22 * 1000000 / 15750))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(22 * 1000000 / 15750))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 239)
- MDRV_GFXDECODE(skyraid)
+ MCFG_GFXDECODE(skyraid)
- MDRV_PALETTE_INIT(skyraid)
- MDRV_PALETTE_LENGTH(20)
+ MCFG_PALETTE_INIT(skyraid)
+ MCFG_PALETTE_LENGTH(20)
- MDRV_VIDEO_START(skyraid)
- MDRV_VIDEO_UPDATE(skyraid)
+ MCFG_VIDEO_START(skyraid)
+ MCFG_VIDEO_UPDATE(skyraid)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(skyraid)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(skyraid)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 6cc6bbc57aa..2d71e66ef7f 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -746,200 +746,200 @@ static VIDEO_EOF( perfrman )
static MACHINE_CONFIG_START( perfrman, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(perfrman_map)
- MDRV_CPU_IO_MAP(slapfght_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(perfrman_map)
+ MCFG_CPU_IO_MAP(slapfght_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/8) /* 2MHz ???, 16MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(perfrman_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt,4) /* music speed, verified */
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/8) /* 2MHz ???, 16MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(perfrman_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(getstar_interrupt,4) /* music speed, verified */
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_RESET(slapfight)
+ MCFG_MACHINE_RESET(slapfight)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 34*8-1, 2*8, 32*8-1)
+ 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(1*8, 34*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(perfrman)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(perfrman)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(perfrman)
- MDRV_VIDEO_EOF(perfrman)
- MDRV_VIDEO_UPDATE(perfrman)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(perfrman)
+ MCFG_VIDEO_EOF(perfrman)
+ MCFG_VIDEO_UPDATE(perfrman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 16000000/8)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 16000000/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 16000000/8)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 16000000/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tigerhb, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(tigerh_map)
- MDRV_CPU_IO_MAP(tigerhb_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(tigerh_map)
+ MCFG_CPU_IO_MAP(tigerhb_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(slapfght_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(slapfght_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_RESET(slapfight)
+ MCFG_MACHINE_RESET(slapfight)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 36*8-1, 2*8, 32*8-1)
+ 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(1*8, 36*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(slapfght)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(slapfght)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(slapfight)
- MDRV_VIDEO_EOF(perfrman)
- MDRV_VIDEO_UPDATE(slapfight)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(slapfight)
+ MCFG_VIDEO_EOF(perfrman)
+ MCFG_VIDEO_UPDATE(slapfight)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tigerh, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_36MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tigerh_map)
- MDRV_CPU_IO_MAP(tigerh_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_36MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tigerh_map)
+ MCFG_CPU_IO_MAP(tigerh_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slapfght_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(slapfght_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */
- MDRV_CPU_ADD("mcu", M68705,XTAL_36MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tigerh_m68705_map)
+ MCFG_CPU_ADD("mcu", M68705,XTAL_36MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tigerh_m68705_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_RESET(slapfight)
+ MCFG_MACHINE_RESET(slapfight)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 36*8-1, 2*8, 32*8-1)
+ 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(1*8, 36*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(slapfght)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(slapfght)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(slapfight)
- MDRV_VIDEO_EOF(perfrman)
- MDRV_VIDEO_UPDATE(slapfight)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(slapfight)
+ MCFG_VIDEO_EOF(perfrman)
+ MCFG_VIDEO_UPDATE(slapfight)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( slapfigh, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, XTAL_36MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slapfght_map)
- MDRV_CPU_IO_MAP(slapfght_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL_36MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(slapfght_map)
+ MCFG_CPU_IO_MAP(slapfght_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slapfght_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt, 3)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(slapfght_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(getstar_interrupt, 3)
- MDRV_CPU_ADD("mcu", M68705, XTAL_36MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(slapfight_m68705_map)
+ MCFG_CPU_ADD("mcu", M68705, XTAL_36MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(slapfight_m68705_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_RESET(slapfight)
+ MCFG_MACHINE_RESET(slapfight)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 36*8-1, 2*8, 32*8-1)
+ 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(1*8, 36*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(slapfght)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(slapfght)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(slapfight)
- MDRV_VIDEO_EOF(perfrman)
- MDRV_VIDEO_UPDATE(slapfight)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(slapfight)
+ MCFG_VIDEO_EOF(perfrman)
+ MCFG_VIDEO_UPDATE(slapfight)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_36MHz/24) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_36MHz/24) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( slapfighb1, slapfigh )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
/* identical to slapfigh_ but the scroll registers are located elsewhere in memory */
@@ -947,10 +947,10 @@ static MACHINE_CONFIG_DERIVED( slapfighb2, slapfigh )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(slapfighb2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(slapfighb2_map)
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index e77c125cb6d..469b53dad03 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -554,99 +554,99 @@ static MACHINE_START( slapshot )
static MACHINE_CONFIG_START( slapshot, slapshot_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
- MDRV_CPU_PROGRAM_MAP(slapshot_map)
- MDRV_CPU_VBLANK_INT("screen", slapshot_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
+ MCFG_CPU_PROGRAM_MAP(slapshot_map)
+ MCFG_CPU_VBLANK_INT("screen", slapshot_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(opwolf3_z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(opwolf3_z80_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(slapshot)
+ MCFG_MACHINE_START(slapshot)
- MDRV_TC0640FIO_ADD("tc0640fio", slapshot_io_intf)
+ MCFG_TC0640FIO_ADD("tc0640fio", slapshot_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(slapshot)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(slapshot)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(slapshot)
- MDRV_VIDEO_EOF(taito_no_buffer)
- MDRV_VIDEO_UPDATE(slapshot)
+ MCFG_VIDEO_START(slapshot)
+ MCFG_VIDEO_EOF(taito_no_buffer)
+ MCFG_VIDEO_UPDATE(slapshot)
- MDRV_TC0480SCP_ADD("tc0480scp", slapshot_tc0480scp_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0480SCP_ADD("tc0480scp", slapshot_tc0480scp_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2610B, 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_SOUND_ADD("ymsnd", YM2610B, 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)
- MDRV_MK48T08_ADD( "mk48t08" )
+ MCFG_MK48T08_ADD( "mk48t08" )
- MDRV_TC0140SYT_ADD("tc0140syt", slapshot_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", slapshot_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( opwolf3, slapshot_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
- MDRV_CPU_PROGRAM_MAP(opwolf3_map)
- MDRV_CPU_VBLANK_INT("screen", slapshot_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
+ MCFG_CPU_PROGRAM_MAP(opwolf3_map)
+ MCFG_CPU_VBLANK_INT("screen", slapshot_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(opwolf3_z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(opwolf3_z80_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(slapshot)
+ MCFG_MACHINE_START(slapshot)
- MDRV_TC0640FIO_ADD("tc0640fio", slapshot_io_intf)
+ MCFG_TC0640FIO_ADD("tc0640fio", slapshot_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(slapshot)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(slapshot)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(slapshot)
- MDRV_VIDEO_EOF(taito_no_buffer)
- MDRV_VIDEO_UPDATE(slapshot)
+ MCFG_VIDEO_START(slapshot)
+ MCFG_VIDEO_EOF(taito_no_buffer)
+ MCFG_VIDEO_UPDATE(slapshot)
- MDRV_TC0480SCP_ADD("tc0480scp", slapshot_tc0480scp_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0480SCP_ADD("tc0480scp", slapshot_tc0480scp_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2610B, 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_SOUND_ADD("ymsnd", YM2610B, 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)
- MDRV_MK48T08_ADD( "mk48t08" )
+ MCFG_MK48T08_ADD( "mk48t08" )
- MDRV_TC0140SYT_ADD("tc0140syt", slapshot_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", slapshot_tc0140syt_intf)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index cef64fc50b3..bfd09accd30 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -570,30 +570,30 @@ static INTERRUPT_GEN( sliver_int )
static MACHINE_CONFIG_START( sliver, sliver_state )
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(sliver_map)
- MDRV_CPU_VBLANK_INT_HACK(sliver_int,3)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(sliver_map)
+ MCFG_CPU_VBLANK_INT_HACK(sliver_int,3)
- MDRV_CPU_ADD("audiocpu", I8051, 8000000)
- MDRV_CPU_PROGRAM_MAP(soundmem_prg)
- MDRV_CPU_IO_MAP(soundmem_io)
+ MCFG_CPU_ADD("audiocpu", I8051, 8000000)
+ MCFG_CPU_PROGRAM_MAP(soundmem_prg)
+ MCFG_CPU_IO_MAP(soundmem_io)
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 384-1-16, 0*8, 240-1)
+ 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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 384-1-16, 0*8, 240-1)
- MDRV_VIDEO_START(sliver)
- MDRV_VIDEO_UPDATE(sliver)
+ MCFG_VIDEO_START(sliver)
+ MCFG_VIDEO_UPDATE(sliver)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
MACHINE_CONFIG_END
ROM_START( sliver )
diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c
index 95c86a09414..47e5cf5ce87 100644
--- a/src/mame/drivers/slotcarn.c
+++ b/src/mame/drivers/slotcarn.c
@@ -594,34 +594,34 @@ static const ay8910_interface scarn_ay8910_config =
static MACHINE_CONFIG_START( slotcarn, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 2.5 Mhz?
- MDRV_CPU_PROGRAM_MAP(slotcarn_map)
- MDRV_CPU_IO_MAP(spielbud_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 2.5 Mhz?
+ MCFG_CPU_PROGRAM_MAP(slotcarn_map)
+ MCFG_CPU_IO_MAP(spielbud_io_map)
/* 3x 8255 */
- MDRV_PPI8255_ADD( "ppi8255_0", scarn_ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", scarn_ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", scarn_ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_0", scarn_ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", scarn_ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", scarn_ppi8255_intf[2] )
- MDRV_MACHINE_START(merit)
+ MCFG_MACHINE_START(merit)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 512, 0, 512, 256, 0, 256) /* temporary, CRTC will configure screen */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 512, 0, 512, 256, 0, 256) /* temporary, CRTC will configure screen */
- MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
- MDRV_GFXDECODE(slotcarn)
- MDRV_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_UPDATE(slotcarn)
+ MCFG_GFXDECODE(slotcarn)
+ MCFG_PALETTE_LENGTH(0x400)
+ MCFG_VIDEO_UPDATE(slotcarn)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd",AY8910, SND_CLOCK)
- MDRV_SOUND_CONFIG(scarn_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd",AY8910, SND_CLOCK)
+ MCFG_SOUND_CONFIG(scarn_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c
index 387aef1635b..f96beae722e 100644
--- a/src/mame/drivers/sms.c
+++ b/src/mame/drivers/sms.c
@@ -534,49 +534,49 @@ static MACHINE_RESET( sms )
}
static MACHINE_CONFIG_START( sms, driver_device )
- MDRV_CPU_ADD("maincpu", I8088, XTAL_24MHz/8)
- MDRV_CPU_PROGRAM_MAP(sms_map)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/8)
+ MCFG_CPU_PROGRAM_MAP(sms_map)
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_16MHz/8)
- MDRV_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_16MHz/8)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(sms)
- MDRV_MACHINE_RESET(sms)
+ MCFG_MACHINE_START(sms)
+ MCFG_MACHINE_RESET(sms)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- 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(0x1b0, 0x100)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x1af, 0, 0xff)
+ 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(0x1b0, 0x100)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x1af, 0, 0xff)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(sms)
- MDRV_VIDEO_START(sms)
- MDRV_VIDEO_UPDATE(sms)
+ MCFG_PALETTE_INIT(sms)
+ MCFG_VIDEO_START(sms)
+ MCFG_VIDEO_UPDATE(sms)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_16MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_16MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sureshot, sms )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sureshot_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sureshot_map)
- MDRV_MACHINE_START(sureshot)
+ MCFG_MACHINE_START(sureshot)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index a4ffcc84617..8eda76263aa 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -500,31 +500,31 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( kinstb, snes_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
- MDRV_CPU_PROGRAM_MAP(snesb_map)
+ MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
+ MCFG_CPU_PROGRAM_MAP(snesb_map)
/* audio CPU */
- MDRV_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */
- MDRV_CPU_PROGRAM_MAP(spc_mem)
+ MCFG_CPU_ADD("soundcpu", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */
+ MCFG_CPU_PROGRAM_MAP(spc_mem)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START( snes )
- MDRV_MACHINE_RESET( snes )
+ MCFG_MACHINE_START( snes )
+ MCFG_MACHINE_RESET( snes )
/* video hardware */
- MDRV_VIDEO_START( snes )
- MDRV_VIDEO_UPDATE( snes )
+ MCFG_VIDEO_START( snes )
+ MCFG_VIDEO_UPDATE( snes )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("spc700", SNES, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("spc700", SNES, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
static DRIVER_INIT(kinstb)
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index e19d4cbab8f..678f1ae20a1 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -3634,356 +3634,356 @@ GFXDECODE_END
static MACHINE_CONFIG_START( marvins, snk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3360000) /* 3.36 MHz */
- MDRV_CPU_PROGRAM_MAP(marvins_cpuA_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 3360000) /* 3.36 MHz */
+ MCFG_CPU_PROGRAM_MAP(marvins_cpuA_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, 3360000) /* 3.36 MHz */
- MDRV_CPU_PROGRAM_MAP(marvins_cpuB_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, 3360000) /* 3.36 MHz */
+ MCFG_CPU_PROGRAM_MAP(marvins_cpuB_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
- MDRV_CPU_PROGRAM_MAP(marvins_sound_map)
- MDRV_CPU_IO_MAP(marvins_sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_assert, 244) // schematics show a separate 244Hz timer
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
+ MCFG_CPU_PROGRAM_MAP(marvins_sound_map)
+ MCFG_CPU_IO_MAP(marvins_sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_assert, 244) // schematics show a separate 244Hz timer
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
- MDRV_GFXDECODE(marvins)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(marvins)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(tnk3)
- MDRV_VIDEO_START(marvins)
- MDRV_VIDEO_UPDATE(marvins)
+ MCFG_PALETTE_INIT(tnk3)
+ MCFG_VIDEO_START(marvins)
+ MCFG_VIDEO_UPDATE(marvins)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 2000000) /* verified on schematics */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ay1", AY8910, 2000000) /* verified on schematics */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ay2", AY8910, 2000000) /* verified on schematics */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000) /* verified on schematics */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("wave", SNKWAVE, 8000000) /* verified on schematics */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("wave", SNKWAVE, 8000000) /* verified on schematics */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vangrd2, marvins )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(madcrash_cpuA_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(madcrash_cpuA_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(madcrash_cpuB_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(madcrash_cpuB_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( madcrush, marvins )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(madcrush_cpuA_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(madcrush_cpuA_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(madcrush_cpuB_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(madcrush_cpuB_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jcross, snk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3350000) /* NOT verified */
- MDRV_CPU_PROGRAM_MAP(jcross_cpuA_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 3350000) /* NOT verified */
+ MCFG_CPU_PROGRAM_MAP(jcross_cpuA_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, 3350000) /* NOT verified */
- MDRV_CPU_PROGRAM_MAP(jcross_cpuB_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, 3350000) /* NOT verified */
+ MCFG_CPU_PROGRAM_MAP(jcross_cpuB_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* NOT verified */
- MDRV_CPU_PROGRAM_MAP(jcross_sound_map)
- MDRV_CPU_IO_MAP(jcross_sound_portmap)
- MDRV_CPU_PERIODIC_INT(irq0_line_assert, 244) // Marvin's frequency, sounds ok
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* NOT verified */
+ MCFG_CPU_PROGRAM_MAP(jcross_sound_map)
+ MCFG_CPU_IO_MAP(jcross_sound_portmap)
+ MCFG_CPU_PERIODIC_INT(irq0_line_assert, 244) // Marvin's frequency, sounds ok
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
- MDRV_GFXDECODE(tnk3)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(tnk3)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(tnk3)
- MDRV_VIDEO_START(jcross)
- MDRV_VIDEO_UPDATE(tnk3)
+ MCFG_PALETTE_INIT(tnk3)
+ MCFG_VIDEO_START(jcross)
+ MCFG_VIDEO_UPDATE(tnk3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 2000000) /* NOT verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ay1", AY8910, 2000000) /* NOT verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ay2", AY8910, 2000000) /* NOT verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ay2", AY8910, 2000000) /* NOT verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sgladiat, jcross )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sgladiat_cpuA_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sgladiat_cpuA_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(sgladiat_cpuB_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(sgladiat_cpuB_map)
/* video hardware */
/* visible area is correct. Debug info is shown in the black bars at the sides
of the screen when the Debug dip switch is on */
- MDRV_VIDEO_START(sgladiat)
+ MCFG_VIDEO_START(sgladiat)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hal21, jcross )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hal21_cpuA_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hal21_cpuA_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(hal21_cpuB_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(hal21_cpuB_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(hal21_sound_map)
- MDRV_CPU_IO_MAP(hal21_sound_portmap)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 220) // music tempo, hand tuned
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(hal21_sound_map)
+ MCFG_CPU_IO_MAP(hal21_sound_portmap)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 220) // music tempo, hand tuned
/* video hardware */
- MDRV_VIDEO_START(hal21)
+ MCFG_VIDEO_START(hal21)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tnk3, snk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tnk3_cpuA_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnk3_cpuB_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tnk3_cpuB_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnk3_YM3526_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tnk3_YM3526_sound_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
- MDRV_GFXDECODE(tnk3)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(tnk3)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(tnk3)
- MDRV_VIDEO_START(tnk3)
- MDRV_VIDEO_UPDATE(tnk3)
+ MCFG_PALETTE_INIT(tnk3)
+ MCFG_VIDEO_START(tnk3)
+ MCFG_VIDEO_UPDATE(tnk3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3526_config_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3526_config_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( aso, tnk3 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(aso_cpuA_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(aso_cpuA_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(aso_cpuB_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(aso_cpuB_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(aso_YM3526_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(aso_YM3526_sound_map)
/* video hardware */
- MDRV_VIDEO_START(aso)
+ MCFG_VIDEO_START(aso)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( athena, tnk3 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
/* sound hardware */
- MDRV_SOUND_ADD("ym2", YM3526, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3526_config_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3526_config_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fitegolf, tnk3 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("audiocpu")
+ MCFG_CPU_MODIFY("audiocpu")
// xtal is 4MHz instead of 8MHz/2 but the end result is the same
- MDRV_CPU_PROGRAM_MAP(YM3812_sound_map)
+ MCFG_CPU_PROGRAM_MAP(YM3812_sound_map)
/* sound hardware */
- MDRV_SOUND_REPLACE("ym1", YM3812, XTAL_4MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_REPLACE("ym1", YM3812, XTAL_4MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ikari, snk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ikari_cpuA_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(ikari_cpuA_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ikari_cpuB_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(ikari_cpuB_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 28*8-1)
- MDRV_GFXDECODE(ikari)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(ikari)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(ikari)
- MDRV_VIDEO_UPDATE(ikari)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(ikari)
+ MCFG_VIDEO_UPDATE(ikari)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3526_config_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3526_config_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MDRV_SOUND_ADD("ym2", YM3526, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3526_config_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ym2", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3526_config_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( victroad, ikari )
/* basic machine hardware */
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
/* sound hardware */
- MDRV_SOUND_REPLACE("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(y8950_config_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_REPLACE("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(y8950_config_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bermudat, snk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bermudat_cpuA_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(bermudat_cpuA_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(bermudat_cpuB_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(bermudat_cpuB_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
- MDRV_QUANTUM_TIME(HZ(24000))
+ MCFG_QUANTUM_TIME(HZ(24000))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
// this visible area matches the psychos pcb
- MDRV_SCREEN_SIZE(50*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_SIZE(50*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(gwar)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(gwar)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(gwar)
- MDRV_VIDEO_UPDATE(gwar)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(gwar)
+ MCFG_VIDEO_UPDATE(gwar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3526_config_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ym1", YM3526, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3526_config_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MDRV_SOUND_ADD("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(y8950_config_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("ym2", Y8950, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(y8950_config_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psychos, bermudat )
/* video hardware */
- MDRV_VIDEO_START(psychos)
+ MCFG_VIDEO_START(psychos)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gwar, bermudat )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gwar_cpuA_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gwar_cpuA_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(gwar_cpuB_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(gwar_cpuB_map)
MACHINE_CONFIG_END
@@ -3991,100 +3991,100 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gwara, bermudat )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gwara_cpuA_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gwara_cpuA_map)
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(gwara_cpuB_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(gwara_cpuB_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( chopper1, bermudat )
/* basic machine hardware */
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(gwar_cpuB_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(gwar_cpuB_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(YM3812_Y8950_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(YM3812_Y8950_sound_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_MODIFY("screen")
// this visible area matches the flyer
- MDRV_SCREEN_SIZE(51*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 50*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_SIZE(51*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 50*8-1, 0*8, 28*8-1)
/* sound hardware */
- MDRV_SOUND_REPLACE("ym1", YM3812, 4000000)
- MDRV_SOUND_CONFIG(ym3812_config_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("ym1", YM3812, 4000000)
+ MCFG_SOUND_CONFIG(ym3812_config_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( choppera, chopper1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gwar_cpuA_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gwar_cpuA_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tdfever, snk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(tdfever_cpuA_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(tdfever_cpuA_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(tdfever_cpuB_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(tdfever_cpuB_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(50*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(50*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 50*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(tdfever)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(tdfever)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(tdfever)
- MDRV_VIDEO_UPDATE(tdfever)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(tdfever)
+ MCFG_VIDEO_UPDATE(tdfever)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM3526, 4000000)
- MDRV_SOUND_CONFIG(ym3526_config_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym1", YM3526, 4000000)
+ MCFG_SOUND_CONFIG(ym3526_config_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ym2", Y8950, 4000000)
- MDRV_SOUND_CONFIG(y8950_config_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", Y8950, 4000000)
+ MCFG_SOUND_CONFIG(y8950_config_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tdfever2, tdfever )
/* basic machine hardware */
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(Y8950_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(Y8950_sound_map)
/* sound hardware */
// apparently, no "ym1" in tdfever2
// (registers are written to but they cause sound not to work)
- MDRV_DEVICE_REMOVE("ym1")
+ MCFG_DEVICE_REMOVE("ym1")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c
index b6036108488..1cf25d995b2 100644
--- a/src/mame/drivers/snk6502.c
+++ b/src/mame/drivers/snk6502.c
@@ -824,160 +824,160 @@ static MACHINE_RESET( pballoon )
static MACHINE_CONFIG_START( sasuke, snk6502_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // 700 kHz
- MDRV_CPU_PROGRAM_MAP(sasuke_map)
- MDRV_CPU_VBLANK_INT_HACK(satansat_interrupt, 2)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // 700 kHz
+ MCFG_CPU_PROGRAM_MAP(sasuke_map)
+ MCFG_CPU_VBLANK_INT_HACK(satansat_interrupt, 2)
- MDRV_MACHINE_RESET(sasuke)
+ MCFG_MACHINE_RESET(sasuke)
// video hardware
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((MASTER_CLOCK / 16) / (45 * 32 * 8))
- 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, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((MASTER_CLOCK / 16) / (45 * 32 * 8))
+ 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, 0*8, 28*8-1)
- MDRV_GFXDECODE(sasuke)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(sasuke)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(satansat)
- MDRV_VIDEO_START(satansat)
- MDRV_VIDEO_UPDATE(snk6502)
+ MCFG_PALETTE_INIT(satansat)
+ MCFG_VIDEO_START(satansat)
+ MCFG_VIDEO_UPDATE(snk6502)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf)
- MDRV_TIMER_ADD_PERIODIC("sasuke_timer", sasuke_update_counter, HZ(MASTER_CLOCK / 8)) // 1.4 MHz
+ MCFG_TIMER_ADD_PERIODIC("sasuke_timer", sasuke_update_counter, HZ(MASTER_CLOCK / 8)) // 1.4 MHz
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snk6502", SNK6502, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("snk6502", SNK6502, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(sasuke_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(sasuke_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD("sn76477.1", SN76477, 0)
- MDRV_SOUND_CONFIG(sasuke_sn76477_intf_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn76477.1", SN76477, 0)
+ MCFG_SOUND_CONFIG(sasuke_sn76477_intf_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn76477.2", SN76477, 0)
- MDRV_SOUND_CONFIG(sasuke_sn76477_intf_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn76477.2", SN76477, 0)
+ MCFG_SOUND_CONFIG(sasuke_sn76477_intf_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn76477.3", SN76477, 0)
- MDRV_SOUND_CONFIG(sasuke_sn76477_intf_3)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn76477.3", SN76477, 0)
+ MCFG_SOUND_CONFIG(sasuke_sn76477_intf_3)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( satansat, sasuke )
// basic machine hardware
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(satansat_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(satansat_map)
- MDRV_MACHINE_RESET(satansat)
+ MCFG_MACHINE_RESET(satansat)
// video hardware
- MDRV_GFXDECODE(satansat)
+ MCFG_GFXDECODE(satansat)
// sound hardware
- MDRV_SOUND_REPLACE("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(vanguard_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_REPLACE("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(vanguard_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_REPLACE("sn76477.1", SN76477, 0)
- MDRV_SOUND_CONFIG(satansat_sn76477_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("sn76477.1", SN76477, 0)
+ MCFG_SOUND_CONFIG(satansat_sn76477_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_DEVICE_REMOVE("sn76477.2")
- MDRV_DEVICE_REMOVE("sn76477.3")
+ MCFG_DEVICE_REMOVE("sn76477.2")
+ MCFG_DEVICE_REMOVE("sn76477.3")
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( vanguard, snk6502_state )
// basic machine hardware
- //MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8) // 1.4 MHz
- MDRV_CPU_ADD("maincpu", M6502, 930000) // adjusted
- MDRV_CPU_PROGRAM_MAP(vanguard_map)
- MDRV_CPU_VBLANK_INT_HACK(snk6502_interrupt, 2)
+ //MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8) // 1.4 MHz
+ MCFG_CPU_ADD("maincpu", M6502, 930000) // adjusted
+ MCFG_CPU_PROGRAM_MAP(vanguard_map)
+ MCFG_CPU_VBLANK_INT_HACK(snk6502_interrupt, 2)
- MDRV_MACHINE_RESET(vanguard)
+ MCFG_MACHINE_RESET(vanguard)
// video hardware
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE((MASTER_CLOCK / 16) / (45 * 32 * 8))
- 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, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE((MASTER_CLOCK / 16) / (45 * 32 * 8))
+ 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, 0*8, 28*8-1)
- MDRV_GFXDECODE(vanguard)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(vanguard)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(snk6502)
- MDRV_VIDEO_START(snk6502)
- MDRV_VIDEO_UPDATE(snk6502)
+ MCFG_PALETTE_INIT(snk6502)
+ MCFG_VIDEO_START(snk6502)
+ MCFG_VIDEO_UPDATE(snk6502)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK / 16, mc6845_intf)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snk6502", SNK6502, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("snk6502", SNK6502, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(vanguard_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(vanguard_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("sn76477.1", SN76477, 0)
- MDRV_SOUND_CONFIG(vanguard_sn76477_intf_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn76477.1", SN76477, 0)
+ MCFG_SOUND_CONFIG(vanguard_sn76477_intf_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn76477.2", SN76477, 0)
- MDRV_SOUND_CONFIG(vanguard_sn76477_intf_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("sn76477.2", SN76477, 0)
+ MCFG_SOUND_CONFIG(vanguard_sn76477_intf_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fantasy, vanguard )
// basic machine hardware
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fantasy_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(fantasy_map)
// sound hardware
- MDRV_SOUND_REPLACE("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(fantasy_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_REPLACE("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(fantasy_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_REPLACE("sn76477.1", SN76477, 0)
- MDRV_SOUND_CONFIG(fantasy_sn76477_intf)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
+ MCFG_SOUND_REPLACE("sn76477.1", SN76477, 0)
+ MCFG_SOUND_CONFIG(fantasy_sn76477_intf)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(fantasy)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(fantasy)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_DEVICE_REMOVE("sn76477.2")
+ MCFG_DEVICE_REMOVE("sn76477.2")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nibbler, fantasy )
// sound hardware
- MDRV_DEVICE_REMOVE("samples")
+ MCFG_DEVICE_REMOVE("samples")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pballoon, nibbler )
// basic machine hardware
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pballoon_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pballoon_map)
- MDRV_MACHINE_RESET(pballoon)
+ MCFG_MACHINE_RESET(pballoon)
- MDRV_VIDEO_START( pballoon )
+ MCFG_VIDEO_START( pballoon )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index b0c424fa1dd..b37e6f94b87 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -593,46 +593,46 @@ static const ym3812_interface ym3812_config =
static MACHINE_CONFIG_START( pow, snk68_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pow_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(pow_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
// the screen parameters are guessed but should be accurate. They
// give a theoretical refresh rate of 59.1856Hz while the measured
// rate on a SAR board is 59.16Hz.
- MDRV_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 384, 0, 256, 264, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 384, 0, 256, 264, 16, 240)
- MDRV_GFXDECODE(pow)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(pow)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(pow)
- MDRV_VIDEO_UPDATE(pow)
+ MCFG_VIDEO_START(pow)
+ MCFG_VIDEO_UPDATE(pow)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( searchar, pow )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(searchar_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(searchar_map)
- MDRV_VIDEO_START(searchar)
+ MCFG_VIDEO_START(searchar)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index a39a72819ac..06bd08229f9 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -690,51 +690,51 @@ GFXDECODE_END
static MACHINE_CONFIG_START( snookr10, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */
- MDRV_CPU_PROGRAM_MAP(snookr10_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */
+ MCFG_CPU_PROGRAM_MAP(snookr10_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(96*4, 30*8)
- MDRV_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*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(96*4, 30*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(snookr10)
+ MCFG_GFXDECODE(snookr10)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(snookr10)
- MDRV_VIDEO_START(snookr10)
- MDRV_VIDEO_UPDATE(snookr10)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(snookr10)
+ MCFG_VIDEO_START(snookr10)
+ MCFG_VIDEO_UPDATE(snookr10)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* 1 MHz (995.5 kHz measured); pin7 checked HIGH on PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.8)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* 1 MHz (995.5 kHz measured); pin7 checked HIGH on PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.8)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( apple10, snookr10 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
+ MCFG_CPU_MODIFY("maincpu")
/* video hardware */
- MDRV_PALETTE_INIT(apple10)
- MDRV_VIDEO_START(apple10)
+ MCFG_PALETTE_INIT(apple10)
+ MCFG_VIDEO_START(apple10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tenballs, snookr10 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tenballs_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tenballs_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index 478fc0d8384..9865523e6d8 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -1449,76 +1449,76 @@ static const kaneko_pandora_interface snowbros_pandora_config =
static MACHINE_CONFIG_START( snowbros, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz - confirmed */
- MDRV_CPU_PROGRAM_MAP(snowbros_map)
- MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz - confirmed */
+ MCFG_CPU_PROGRAM_MAP(snowbros_map)
+ MCFG_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
- MDRV_CPU_ADD("soundcpu", Z80, 6000000) /* 6 MHz - confirmed */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 6000000) /* 6 MHz - confirmed */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.5) /* ~57.5 - confirmed */
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.5) /* ~57.5 - confirmed */
+ 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)
- MDRV_GFXDECODE(snowbros)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(snowbros)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(snowbros)
- MDRV_VIDEO_EOF(snowbros)
+ MCFG_VIDEO_UPDATE(snowbros)
+ MCFG_VIDEO_EOF(snowbros)
- MDRV_KANEKO_PANDORA_ADD("pandora", snowbros_pandora_config)
+ MCFG_KANEKO_PANDORA_ADD("pandora", snowbros_pandora_config)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wintbob, snowbros )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(10000000) /* 10mhz - Confirmed */
- MDRV_CPU_PROGRAM_MAP(wintbob_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(10000000) /* 10mhz - Confirmed */
+ MCFG_CPU_PROGRAM_MAP(wintbob_map)
- MDRV_DEVICE_REMOVE("pandora")
+ MCFG_DEVICE_REMOVE("pandora")
/* video hardware */
- MDRV_GFXDECODE(wb)
- MDRV_VIDEO_UPDATE(wintbob)
- MDRV_VIDEO_EOF(0)
+ MCFG_GFXDECODE(wb)
+ MCFG_VIDEO_UPDATE(wintbob)
+ MCFG_VIDEO_EOF(0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( semicom, snowbros )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(16000000) /* 16mhz or 12mhz ? */
- MDRV_CPU_PROGRAM_MAP(hyperpac_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(16000000) /* 16mhz or 12mhz ? */
+ MCFG_CPU_PROGRAM_MAP(hyperpac_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CLOCK(4000000) /* 4.0 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(hyperpac_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CLOCK(4000000) /* 4.0 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(hyperpac_sound_map)
- MDRV_GFXDECODE(hyperpac)
+ MCFG_GFXDECODE(hyperpac)
/* sound hardware */
- MDRV_SOUND_REPLACE("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_OKIM6295_ADD("oki", 999900, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 999900, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1527,14 +1527,14 @@ static MACHINE_CONFIG_DERIVED( semicom_mcu, semicom )
/* basic machine hardware */
- MDRV_CPU_ADD("protection", I8052, 16000000) // AT89C52
- MDRV_CPU_PROGRAM_MAP(protection_map)
- MDRV_CPU_IO_MAP(protection_iomap)
+ MCFG_CPU_ADD("protection", I8052, 16000000) // AT89C52
+ MCFG_CPU_PROGRAM_MAP(protection_map)
+ MCFG_CPU_IO_MAP(protection_iomap)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( semiprot, semicom )
- MDRV_MACHINE_RESET ( semiprot )
+ MCFG_MACHINE_RESET ( semiprot )
MACHINE_CONFIG_END
/*
@@ -1560,72 +1560,72 @@ See included pics
static MACHINE_CONFIG_START( honeydol, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(honeydol_map)
- MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(honeydol_map)
+ MCFG_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
- MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(honeydol_sound_map)
- MDRV_CPU_IO_MAP(honeydol_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(honeydol_sound_map)
+ MCFG_CPU_IO_MAP(honeydol_sound_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.5)
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.5)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(honeydol)
- MDRV_PALETTE_LENGTH(0x800/2)
+ MCFG_GFXDECODE(honeydol)
+ MCFG_PALETTE_LENGTH(0x800/2)
- MDRV_VIDEO_UPDATE(honeydol)
+ MCFG_VIDEO_UPDATE(honeydol)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* sound hardware */
- MDRV_SOUND_ADD("ymsnd", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 999900, OKIM6295_PIN7_HIGH) /* freq? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 999900, OKIM6295_PIN7_HIGH) /* freq? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( twinadv, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) // or 12
- MDRV_CPU_PROGRAM_MAP(twinadv_map)
- MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) // or 12
+ MCFG_CPU_PROGRAM_MAP(twinadv_map)
+ MCFG_CPU_VBLANK_INT_HACK(snowbros_interrupt,3)
- MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(twinadv_sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("soundcpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(twinadv_sound_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.5)
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.5)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(twinadv)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(twinadv)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_UPDATE(twinadv)
+ MCFG_VIDEO_UPDATE(twinadv)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* sound hardware */
- MDRV_OKIM6295_ADD("oki", 12000000/12, OKIM6295_PIN7_HIGH) /* freq? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 12000000/12, OKIM6295_PIN7_HIGH) /* freq? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1649,56 +1649,56 @@ Intel P8752 (mcu)
static MACHINE_CONFIG_DERIVED( finalttr, semicom )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(12000000)
- MDRV_CPU_PROGRAM_MAP(finalttr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(12000000)
+ MCFG_CPU_PROGRAM_MAP(finalttr_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_CLOCK(3578545)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_CLOCK(3578545)
- MDRV_MACHINE_RESET ( finalttr )
+ MCFG_MACHINE_RESET ( finalttr )
- MDRV_SOUND_REPLACE("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.08)
- MDRV_SOUND_ROUTE(1, "mono", 0.08)
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.08)
+ MCFG_SOUND_ROUTE(1, "mono", 0.08)
- MDRV_OKIM6295_REPLACE("oki", 999900, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_OKIM6295_REPLACE("oki", 999900, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( _4in1, semicom )
/* basic machine hardware */
- MDRV_GFXDECODE(snowbros)
+ MCFG_GFXDECODE(snowbros)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( snowbro3, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz or 12mhz ? */
- MDRV_CPU_PROGRAM_MAP(snowbros3_map)
- MDRV_CPU_VBLANK_INT_HACK(snowbro3_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz or 12mhz ? */
+ MCFG_CPU_PROGRAM_MAP(snowbros3_map)
+ MCFG_CPU_VBLANK_INT_HACK(snowbro3_interrupt,3)
/* 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)
+ 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)
- MDRV_GFXDECODE(sb3)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(sb3)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_UPDATE(snowbro3)
+ MCFG_VIDEO_UPDATE(snowbro3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 999900, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 999900, 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/solomon.c b/src/mame/drivers/solomon.c
index 5a03636684d..e7b0879f116 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -191,41 +191,41 @@ GFXDECODE_END
static MACHINE_CONFIG_START( solomon, solomon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz (?????) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
-
- MDRV_CPU_ADD("audiocpu", Z80, 3072000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? */
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz (?????) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
+
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? */
/* NMIs are caused by the main CPU */
/* 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)
+ 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)
- MDRV_GFXDECODE(solomon)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(solomon)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(solomon)
- MDRV_VIDEO_UPDATE(solomon)
+ MCFG_VIDEO_START(solomon)
+ MCFG_VIDEO_UPDATE(solomon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_ADD("ay3", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index 9587889f1af..6d749df6de5 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -246,39 +246,39 @@ static MACHINE_RESET( sonson )
static MACHINE_CONFIG_START( sonson, sonson_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809,12000000/6) /* 2 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809,12000000/6) /* 2 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", M6809,12000000/6) /* 2 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* FIRQs are triggered by the main CPU */
+ MCFG_CPU_ADD("audiocpu", M6809,12000000/6) /* 2 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* FIRQs are triggered by the main CPU */
- MDRV_MACHINE_START(sonson)
- MDRV_MACHINE_RESET(sonson)
+ MCFG_MACHINE_START(sonson)
+ MCFG_MACHINE_RESET(sonson)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(sonson)
- MDRV_PALETTE_LENGTH(64*4+32*8)
+ MCFG_GFXDECODE(sonson)
+ MCFG_PALETTE_LENGTH(64*4+32*8)
- MDRV_PALETTE_INIT(sonson)
- MDRV_VIDEO_START(sonson)
- MDRV_VIDEO_UPDATE(sonson)
+ MCFG_PALETTE_INIT(sonson)
+ MCFG_VIDEO_START(sonson)
+ MCFG_VIDEO_UPDATE(sonson)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 12000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 12000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 12000000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, 12000000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c
index 440d823ef67..7ee4fbe851a 100644
--- a/src/mame/drivers/sothello.c
+++ b/src/mame/drivers/sothello.c
@@ -348,47 +348,47 @@ static MACHINE_CONFIG_START( sothello, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, MAINCPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(maincpu_mem_map)
- MDRV_CPU_IO_MAP(maincpu_io_map)
- MDRV_CPU_VBLANK_INT_HACK(sothello_interrupt,262)
+ MCFG_CPU_ADD("maincpu",Z80, MAINCPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(maincpu_mem_map)
+ MCFG_CPU_IO_MAP(maincpu_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(sothello_interrupt,262)
- MDRV_CPU_ADD("soundcpu",Z80, SOUNDCPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(soundcpu_mem_map)
- MDRV_CPU_IO_MAP(soundcpu_io_map)
+ MCFG_CPU_ADD("soundcpu",Z80, SOUNDCPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(soundcpu_mem_map)
+ MCFG_CPU_IO_MAP(soundcpu_io_map)
- MDRV_CPU_ADD("sub",M6809, SUBCPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(subcpu_mem_map)
+ MCFG_CPU_ADD("sub",M6809, SUBCPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(subcpu_mem_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(sothello)
+ MCFG_MACHINE_RESET(sothello)
- 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 + 32, (212 + 28) * 2)
- MDRV_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1)
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT( v9938 )
- MDRV_VIDEO_START(sothello)
- MDRV_VIDEO_UPDATE(generic_bitmapped)
+ 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 + 32, (212 + 28) * 2)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512 + 32 - 1, 0, (212 + 28) * 2 - 1)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT( v9938 )
+ MCFG_VIDEO_START(sothello)
+ MCFG_VIDEO_UPDATE(generic_bitmapped)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, YM_CLOCK)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
-
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
-
- MDRV_SOUND_ADD("msm",MSM5205, MSM_CLOCK)
- MDRV_SOUND_CONFIG(msm_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2203, YM_CLOCK)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
+
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+
+ MCFG_SOUND_ADD("msm",MSM5205, MSM_CLOCK)
+ MCFG_SOUND_CONFIG(msm_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 1dd918b38d1..3ceff37b4c2 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -336,29 +336,29 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( spacefb, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, SPACEFB_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(spacefb_main_map)
- MDRV_CPU_IO_MAP(spacefb_main_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, SPACEFB_MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(spacefb_main_map)
+ MCFG_CPU_IO_MAP(spacefb_main_io_map)
- MDRV_CPU_ADD("audiocpu", I8035, SPACEFB_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(spacefb_audio_map)
- MDRV_CPU_IO_MAP(spacefb_audio_io_map)
+ MCFG_CPU_ADD("audiocpu", I8035, SPACEFB_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(spacefb_audio_map)
+ MCFG_CPU_IO_MAP(spacefb_audio_io_map)
- MDRV_QUANTUM_TIME(HZ(180))
+ MCFG_QUANTUM_TIME(HZ(180))
- MDRV_MACHINE_START(spacefb)
- MDRV_MACHINE_RESET(spacefb)
+ MCFG_MACHINE_START(spacefb)
+ MCFG_MACHINE_RESET(spacefb)
/* video hardware */
- MDRV_VIDEO_START(spacefb)
- MDRV_VIDEO_UPDATE(spacefb)
+ MCFG_VIDEO_START(spacefb)
+ MCFG_VIDEO_UPDATE(spacefb)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(SPACEFB_PIXEL_CLOCK, SPACEFB_HTOTAL, SPACEFB_HBEND, SPACEFB_HBSTART, SPACEFB_VTOTAL, SPACEFB_VBEND, SPACEFB_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(SPACEFB_PIXEL_CLOCK, SPACEFB_HTOTAL, SPACEFB_HBEND, SPACEFB_HBSTART, SPACEFB_VTOTAL, SPACEFB_VBEND, SPACEFB_VBSTART)
/* audio hardware */
- MDRV_FRAGMENT_ADD(spacefb_audio)
+ MCFG_FRAGMENT_ADD(spacefb_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index eee64f72dbc..20fd1f2b867 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -399,36 +399,36 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( spaceg, spaceg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,2500000) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(spaceg_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* 60 Hz NMIs (verified) */
+ MCFG_CPU_ADD("maincpu", Z80,2500000) /* 2.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(spaceg_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) /* 60 Hz NMIs (verified) */
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 32, 255)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 32, 255)
- MDRV_PALETTE_LENGTH(16+128-16)
- MDRV_PALETTE_INIT( spaceg )
- MDRV_VIDEO_UPDATE( spaceg )
+ MCFG_PALETTE_LENGTH(16+128-16)
+ MCFG_PALETTE_INIT( spaceg )
+ MCFG_VIDEO_UPDATE( spaceg )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("sn1", SN76496, 15468480/4)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+// MCFG_SOUND_ADD("sn1", SN76496, 15468480/4)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-// MDRV_SOUND_ADD("sn2", SN76496, 15468480/4)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+// MCFG_SOUND_ADD("sn2", SN76496, 15468480/4)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-// MDRV_SOUND_ADD("sn3", SN76496, 15468480/4)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+// MCFG_SOUND_ADD("sn3", SN76496, 15468480/4)
+// 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/spbactn.c b/src/mame/drivers/spbactn.c
index fc44219e8d2..3c354f0646a 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -336,36 +336,36 @@ static const ym3812_interface ym3812_config =
static MACHINE_CONFIG_START( spbactn, spbactn_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(spbactn_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(spbactn_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(spbactn_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(spbactn_sound_map)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*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_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(spbactn)
- MDRV_PALETTE_LENGTH(0x2800/2)
+ MCFG_GFXDECODE(spbactn)
+ MCFG_PALETTE_LENGTH(0x2800/2)
- MDRV_VIDEO_START(spbactn)
- MDRV_VIDEO_UPDATE(spbactn)
+ MCFG_VIDEO_START(spbactn)
+ MCFG_VIDEO_UPDATE(spbactn)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
ROM_START( spbactn )
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index d7158ce83be..d6a89a6c90e 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -242,39 +242,39 @@ static MACHINE_CONFIG_START( spcforce, spcforce_state )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
- MDRV_CPU_ADD("maincpu", I8085A, 8000000 * 2) /* 4.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(spcforce_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_pulse)
+ MCFG_CPU_ADD("maincpu", I8085A, 8000000 * 2) /* 4.00 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(spcforce_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_pulse)
- MDRV_CPU_ADD("audiocpu", I8035, 6144000) /* divisor ??? */
- MDRV_CPU_PROGRAM_MAP(spcforce_sound_map)
- MDRV_CPU_IO_MAP(spcforce_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I8035, 6144000) /* divisor ??? */
+ MCFG_CPU_PROGRAM_MAP(spcforce_sound_map)
+ MCFG_CPU_IO_MAP(spcforce_sound_io_map)
/* 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(0*8, 32*8-1, 0*8, 28*8-1)
+ 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(0*8, 32*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(spcforce)
- MDRV_PALETTE_LENGTH(sizeof(colortable_source) / sizeof(colortable_source[0]))
+ MCFG_GFXDECODE(spcforce)
+ MCFG_PALETTE_LENGTH(sizeof(colortable_source) / sizeof(colortable_source[0]))
- MDRV_PALETTE_INIT(spcforce)
- MDRV_VIDEO_UPDATE(spcforce)
+ MCFG_PALETTE_INIT(spcforce)
+ MCFG_VIDEO_UPDATE(spcforce)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76496, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn3", SN76496, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn3", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index cc00ea8b1e3..251ea49698e 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -424,47 +424,47 @@ static MACHINE_RESET( spdodgeb )
static MACHINE_CONFIG_START( spdodgeb, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,12000000/6) /* 2MHz ? */
- MDRV_CPU_PROGRAM_MAP(spdodgeb_map)
- MDRV_CPU_VBLANK_INT_HACK(spdodgeb_interrupt,33) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */
+ MCFG_CPU_ADD("maincpu", M6502,12000000/6) /* 2MHz ? */
+ MCFG_CPU_PROGRAM_MAP(spdodgeb_map)
+ MCFG_CPU_VBLANK_INT_HACK(spdodgeb_interrupt,33) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */
- MDRV_CPU_ADD("audiocpu", M6809,12000000/6) /* 2MHz ? */
- MDRV_CPU_PROGRAM_MAP(spdodgeb_sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809,12000000/6) /* 2MHz ? */
+ MCFG_CPU_PROGRAM_MAP(spdodgeb_sound_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(spdodgeb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(spdodgeb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(spdodgeb)
- MDRV_VIDEO_START(spdodgeb)
- MDRV_VIDEO_UPDATE(spdodgeb)
+ MCFG_PALETTE_INIT(spdodgeb)
+ MCFG_VIDEO_START(spdodgeb)
+ MCFG_VIDEO_UPDATE(spdodgeb)
- MDRV_MACHINE_RESET( spdodgeb )
+ MCFG_MACHINE_RESET( spdodgeb )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("msm1", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
-
- MDRV_SOUND_ADD("msm2", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("msm1", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+
+ MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index a27b8f6a8f6..e6a75a027d8 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -318,36 +318,36 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( speedatk, speedatk_state )
- MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK/2) //divider is unknown
- MDRV_CPU_PROGRAM_MAP(speedatk_mem)
- MDRV_CPU_IO_MAP(speedatk_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/2) //divider is unknown
+ MCFG_CPU_PROGRAM_MAP(speedatk_mem)
+ MCFG_CPU_IO_MAP(speedatk_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_WATCHDOG_VBLANK_INIT(8) // timing is unknown
+ MCFG_WATCHDOG_VBLANK_INIT(8) // timing is unknown
/* 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(320, 256)
- 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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_MC6845_ADD("crtc", H46505, MASTER_CLOCK/16, mc6845_intf) /* hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, MASTER_CLOCK/16, mc6845_intf) /* hand tuned to get ~60 fps */
- MDRV_GFXDECODE(speedatk)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(speedatk)
+ MCFG_GFXDECODE(speedatk)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(speedatk)
- MDRV_VIDEO_START(speedatk)
- MDRV_VIDEO_UPDATE(speedatk)
+ MCFG_VIDEO_START(speedatk)
+ MCFG_VIDEO_UPDATE(speedatk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/4) //divider is unknown
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/4) //divider is unknown
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
ROM_START( speedatk )
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index 810dff34498..167c81ab6b4 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -221,37 +221,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( speedbal, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_cpu_map)
- MDRV_CPU_IO_MAP(main_cpu_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_cpu_map)
+ MCFG_CPU_IO_MAP(main_cpu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 2660000) /* 2.66 MHz ??? Maybe yes */
- MDRV_CPU_PROGRAM_MAP(sound_cpu_map)
- MDRV_CPU_IO_MAP(sound_cpu_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
+ MCFG_CPU_ADD("audiocpu", Z80, 2660000) /* 2.66 MHz ??? Maybe yes */
+ MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
+ MCFG_CPU_IO_MAP(sound_cpu_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(speedbal)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(speedbal)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(speedbal)
- MDRV_VIDEO_UPDATE(speedbal)
+ MCFG_VIDEO_START(speedbal)
+ MCFG_VIDEO_UPDATE(speedbal)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3600000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3600000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index dd6a1b974b5..85873620546 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -270,33 +270,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( speedspn, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(speedspn_map)
- MDRV_CPU_IO_MAP(speedspn_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,6000000) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(speedspn_map)
+ MCFG_CPU_IO_MAP(speedspn_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(speedspn_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(speedspn_sound_map)
/* 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(8*8, 56*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(speedspn)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(speedspn)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(speedspn)
- MDRV_VIDEO_UPDATE(speedspn)
+ MCFG_VIDEO_START(speedspn)
+ MCFG_VIDEO_UPDATE(speedspn)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/*** ROM LOADING *************************************************************/
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index b93e45c5628..8472b5b9797 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -320,40 +320,40 @@ static MACHINE_RESET(speglsht)
static MACHINE_CONFIG_START( speglsht, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80, 8000000) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(st0016_mem)
- MDRV_CPU_IO_MAP(st0016_io)
+ MCFG_CPU_ADD("maincpu",Z80, 8000000) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(st0016_mem)
+ MCFG_CPU_IO_MAP(st0016_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", R3000LE, 25000000)
- MDRV_CPU_CONFIG(r3000_config)
- MDRV_CPU_PROGRAM_MAP(speglsht_mem)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_assert)
+ MCFG_CPU_ADD("sub", R3000LE, 25000000)
+ MCFG_CPU_CONFIG(r3000_config)
+ MCFG_CPU_PROGRAM_MAP(speglsht_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_assert)
- MDRV_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET(speglsht)
+ MCFG_QUANTUM_TIME(HZ(6000))
+ MCFG_MACHINE_RESET(speglsht)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 8, 239-8)
+ 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(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 8, 239-8)
- MDRV_GFXDECODE(speglsht)
- MDRV_PALETTE_LENGTH(16*16*4+1)
+ MCFG_GFXDECODE(speglsht)
+ MCFG_PALETTE_LENGTH(16*16*4+1)
- MDRV_VIDEO_START(st0016)
- MDRV_VIDEO_UPDATE(st0016)
+ MCFG_VIDEO_START(st0016)
+ MCFG_VIDEO_UPDATE(st0016)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("stsnd", ST0016, 0)
- MDRV_SOUND_CONFIG(st0016_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("stsnd", ST0016, 0)
+ MCFG_SOUND_CONFIG(st0016_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
ROM_START( speglsht )
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index 2fcbc25fc90..11e2773316b 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -709,36 +709,36 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( spiders, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2800000)
- MDRV_CPU_PROGRAM_MAP(spiders_main_map)
- MDRV_CPU_PERIODIC_INT(update_pia_1, 25)
+ MCFG_CPU_ADD("maincpu", M6809, 2800000)
+ MCFG_CPU_PROGRAM_MAP(spiders_main_map)
+ MCFG_CPU_PERIODIC_INT(update_pia_1, 25)
- MDRV_CPU_ADD("audiocpu", M6802, 3000000)
- MDRV_CPU_PROGRAM_MAP(spiders_audio_map)
+ MCFG_CPU_ADD("audiocpu", M6802, 3000000)
+ MCFG_CPU_PROGRAM_MAP(spiders_audio_map)
- MDRV_MACHINE_START(spiders)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(spiders)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_UPDATE(spiders)
+ MCFG_VIDEO_UPDATE(spiders)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
- MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
/* 74LS123 */
- MDRV_PIA6821_ADD("pia1", pia_1_intf)
- MDRV_PIA6821_ADD("pia2", pia_2_intf)
- MDRV_PIA6821_ADD("pia3", pia_3_intf)
- MDRV_PIA6821_ADD("pia4", pia_4_intf)
+ MCFG_PIA6821_ADD("pia1", pia_1_intf)
+ MCFG_PIA6821_ADD("pia2", pia_2_intf)
+ MCFG_PIA6821_ADD("pia3", pia_3_intf)
+ MCFG_PIA6821_ADD("pia4", pia_4_intf)
- MDRV_TTL74123_ADD("ic60", ic60_intf)
+ MCFG_TTL74123_ADD("ic60", ic60_intf)
/* audio hardware */
- MDRV_FRAGMENT_ADD(spiders_audio)
+ MCFG_FRAGMENT_ADD(spiders_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 760b0e9ab29..eb178d26f58 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -385,39 +385,39 @@ static MACHINE_RESET( splash )
static MACHINE_CONFIG_START( splash, splash_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (24/2) */
- MDRV_CPU_PROGRAM_MAP(splash_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (24/2) */
+ MCFG_CPU_PROGRAM_MAP(splash_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,30000000/8)
- MDRV_CPU_PROGRAM_MAP(splash_sound_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
+ MCFG_CPU_ADD("audiocpu", Z80,30000000/8)
+ MCFG_CPU_PROGRAM_MAP(splash_sound_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 48*8-1, 2*8, 32*8-1)
+ 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, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 48*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(splash)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(splash)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(splash)
- MDRV_VIDEO_UPDATE(splash)
+ MCFG_VIDEO_START(splash)
+ MCFG_VIDEO_UPDATE(splash)
- MDRV_MACHINE_RESET( splash )
+ MCFG_MACHINE_RESET( splash )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(splash_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(splash_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static void ym_irq(running_device *device, int state)
@@ -438,79 +438,79 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( roldfrog, splash_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz - verified */
- MDRV_CPU_PROGRAM_MAP(roldfrog_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz - verified */
+ MCFG_CPU_PROGRAM_MAP(roldfrog_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,3000000) /* 3 MHz - verified */
- MDRV_CPU_PROGRAM_MAP(roldfrog_sound_map)
- MDRV_CPU_IO_MAP(roldfrog_sound_io_map)
-// MDRV_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
+ MCFG_CPU_ADD("audiocpu", Z80,3000000) /* 3 MHz - verified */
+ MCFG_CPU_PROGRAM_MAP(roldfrog_sound_map)
+ MCFG_CPU_IO_MAP(roldfrog_sound_io_map)
+// MCFG_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 48*8-1, 2*8, 32*8-1)
-// MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 64*8-1)
-
- MDRV_GFXDECODE(splash)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(splash)
- MDRV_VIDEO_UPDATE(splash)
-
- MDRV_MACHINE_RESET( splash )
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ROUTE(2, "mono", 0.60)
- MDRV_SOUND_ROUTE(3, "mono", 0.40)
+ 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, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 48*8-1, 2*8, 32*8-1)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 64*8-1)
+
+ MCFG_GFXDECODE(splash)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(splash)
+ MCFG_VIDEO_UPDATE(splash)
+
+ MCFG_MACHINE_RESET( splash )
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ROUTE(2, "mono", 0.60)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( funystrp, splash_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (24/2) */
- MDRV_CPU_PROGRAM_MAP(funystrp_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz (24/2) */
+ MCFG_CPU_PROGRAM_MAP(funystrp_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
-// MDRV_CPU_ADD("audiocpu", Z80,30000000/8)
-// MDRV_CPU_PROGRAM_MAP(funystrp_sound_map)
-// MDRV_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
+// MCFG_CPU_ADD("audiocpu", Z80,30000000/8)
+// MCFG_CPU_PROGRAM_MAP(funystrp_sound_map)
+// MCFG_CPU_PERIODIC_INT(nmi_line_pulse,60*64) /* needed for the msm5205 to play the samples */
/* 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, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 32*8-1)
+ 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, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(splash)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(splash)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(splash)
- MDRV_VIDEO_UPDATE(funystrp)
+ MCFG_VIDEO_START(splash)
+ MCFG_VIDEO_UPDATE(funystrp)
- MDRV_MACHINE_RESET( splash )
+ MCFG_MACHINE_RESET( splash )
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
+// MCFG_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("ymsnd", YM3812, 3000000)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+// MCFG_SOUND_ADD("ymsnd", YM3812, 3000000)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
-// MDRV_SOUND_ADD("msm", MSM5205, 384000)
-// MDRV_SOUND_CONFIG(msm5205_config)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+// MCFG_SOUND_ADD("msm", MSM5205, 384000)
+// MCFG_SOUND_CONFIG(msm5205_config)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
index 0d7097ae270..fcff86150aa 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -388,36 +388,36 @@ static INTERRUPT_GEN( spoker_interrupt )
static MACHINE_CONFIG_START( spoker, spoker_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(spoker_map)
- MDRV_CPU_IO_MAP(spoker_portmap)
- MDRV_CPU_VBLANK_INT("screen",spoker_interrupt)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
+ MCFG_CPU_PROGRAM_MAP(spoker_map)
+ MCFG_CPU_IO_MAP(spoker_portmap)
+ MCFG_CPU_VBLANK_INT("screen",spoker_interrupt)
- MDRV_MACHINE_RESET(spoker)
+ MCFG_MACHINE_RESET(spoker)
- 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(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-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-16-1)
- MDRV_GFXDECODE(spoker)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(spoker)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(spoker)
- MDRV_VIDEO_UPDATE(spoker)
+ MCFG_VIDEO_START(spoker)
+ MCFG_VIDEO_UPDATE(spoker)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c
index dd40417e98a..6684ceeb780 100644
--- a/src/mame/drivers/spool99.c
+++ b/src/mame/drivers/spool99.c
@@ -335,39 +335,39 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( spool99, spool99_state )
- MDRV_CPU_ADD("maincpu", Z80, 24000000/8)
- MDRV_CPU_PROGRAM_MAP(spool99_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 24000000/8)
+ MCFG_CPU_PROGRAM_MAP(spool99_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_GFXDECODE(spool99)
+ MCFG_GFXDECODE(spool99)
- 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(7*8, 55*8-1, 1*8, 31*8-1) //384x240,raw guess
+ 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(7*8, 55*8-1, 1*8, 31*8-1) //384x240,raw guess
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_VIDEO_START(spool99)
- MDRV_VIDEO_UPDATE(spool99)
+ MCFG_VIDEO_START(spool99)
+ MCFG_VIDEO_UPDATE(spool99)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vcarn, spool99 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vcarn_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(vcarn_map)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*8-1) //512x240, raw guess
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*8-1) //512x240, raw guess
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index 532b982af9f..920f9836ada 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -266,44 +266,44 @@ static MACHINE_START( sprcros2 )
static MACHINE_CONFIG_START( sprcros2, sprcros2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("master", Z80,10000000/2)
- MDRV_CPU_PROGRAM_MAP(sprcros2_master_map)
- MDRV_CPU_IO_MAP(sprcros2_master_io_map)
- MDRV_CPU_VBLANK_INT_HACK(sprcros2_m_interrupt,2) //1 nmi + 1 irq
+ MCFG_CPU_ADD("master", Z80,10000000/2)
+ MCFG_CPU_PROGRAM_MAP(sprcros2_master_map)
+ MCFG_CPU_IO_MAP(sprcros2_master_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(sprcros2_m_interrupt,2) //1 nmi + 1 irq
- MDRV_CPU_ADD("slave", Z80,10000000/2)
- MDRV_CPU_PROGRAM_MAP(sprcros2_slave_map)
- MDRV_CPU_IO_MAP(sprcros2_slave_io_map)
- MDRV_CPU_VBLANK_INT_HACK(sprcros2_s_interrupt,2) //2 nmis
+ MCFG_CPU_ADD("slave", Z80,10000000/2)
+ MCFG_CPU_PROGRAM_MAP(sprcros2_slave_map)
+ MCFG_CPU_IO_MAP(sprcros2_slave_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(sprcros2_s_interrupt,2) //2 nmis
- MDRV_MACHINE_START(sprcros2)
+ MCFG_MACHINE_START(sprcros2)
/* 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(1*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(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(sprcros2)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(sprcros2)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_PALETTE_INIT(sprcros2)
- MDRV_VIDEO_START(sprcros2)
- MDRV_VIDEO_UPDATE(sprcros2)
+ MCFG_PALETTE_INIT(sprcros2)
+ MCFG_VIDEO_START(sprcros2)
+ MCFG_VIDEO_UPDATE(sprcros2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, 10000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76489, 10000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76489, 10000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76489, 10000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn3", SN76489, 10000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn3", SN76489, 10000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
ROM_START( sprcros2 )
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 680dbbb26cc..126a12bef47 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -495,63 +495,63 @@ GFXDECODE_END
static MACHINE_CONFIG_START( sprint2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MDRV_CPU_PROGRAM_MAP(sprint2_map)
- MDRV_CPU_VBLANK_INT("screen", sprint2)
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16)
+ MCFG_CPU_PROGRAM_MAP(sprint2_map)
+ MCFG_CPU_VBLANK_INT("screen", sprint2)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 223)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 223)
- MDRV_GFXDECODE(sprint2)
- MDRV_PALETTE_LENGTH(12)
+ MCFG_GFXDECODE(sprint2)
+ MCFG_PALETTE_LENGTH(12)
- MDRV_PALETTE_INIT(sprint2)
- MDRV_VIDEO_START(sprint2)
- MDRV_VIDEO_UPDATE(sprint2)
- MDRV_VIDEO_EOF(sprint2)
+ MCFG_PALETTE_INIT(sprint2)
+ MCFG_VIDEO_START(sprint2)
+ MCFG_VIDEO_UPDATE(sprint2)
+ MCFG_VIDEO_EOF(sprint2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(sprint2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(sprint2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sprint1, sprint2 )
/* sound hardware */
- MDRV_DEVICE_REMOVE("lspeaker")
- MDRV_DEVICE_REMOVE("rspeaker")
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_DEVICE_REMOVE("lspeaker")
+ MCFG_DEVICE_REMOVE("rspeaker")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_DEVICE_REMOVE("discrete")
+ MCFG_DEVICE_REMOVE("discrete")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(sprint1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(sprint1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dominos, sprint2 )
/* sound hardware */
- MDRV_DEVICE_REMOVE("lspeaker")
- MDRV_DEVICE_REMOVE("rspeaker")
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_DEVICE_REMOVE("lspeaker")
+ MCFG_DEVICE_REMOVE("rspeaker")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_DEVICE_REMOVE("discrete")
+ MCFG_DEVICE_REMOVE("discrete")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dominos)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dominos)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index d8e3ae8cd6a..af3c9d1aaa6 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -401,31 +401,31 @@ GFXDECODE_END
static MACHINE_CONFIG_START( sprint4, sprint4_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(sprint4_cpu_map)
+ MCFG_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(sprint4_cpu_map)
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_MACHINE_RESET(sprint4)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_RESET(sprint4)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, 256, VTOTAL, 0, 224)
- MDRV_GFXDECODE(sprint4)
- MDRV_PALETTE_LENGTH(10)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, 256, VTOTAL, 0, 224)
+ MCFG_GFXDECODE(sprint4)
+ MCFG_PALETTE_LENGTH(10)
- MDRV_PALETTE_INIT(sprint4)
- MDRV_VIDEO_START(sprint4)
- MDRV_VIDEO_UPDATE(sprint4)
- MDRV_VIDEO_EOF(sprint4)
+ MCFG_PALETTE_INIT(sprint4)
+ MCFG_VIDEO_START(sprint4)
+ MCFG_VIDEO_UPDATE(sprint4)
+ MCFG_VIDEO_EOF(sprint4)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(sprint4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(sprint4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index 6bb71183f5c..c04d745e564 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -455,46 +455,46 @@ GFXDECODE_END
static MACHINE_CONFIG_START( sprint8, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, 11055000 / 11) /* ? */
- MDRV_CPU_PROGRAM_MAP(sprint8_map)
+ MCFG_CPU_ADD("maincpu", M6800, 11055000 / 11) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sprint8_map)
- MDRV_MACHINE_RESET(sprint8)
+ MCFG_MACHINE_RESET(sprint8)
- MDRV_TIMER_ADD_PERIODIC("input_timer", input_callback, HZ(60))
+ MCFG_TIMER_ADD_PERIODIC("input_timer", input_callback, HZ(60))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 261)
- MDRV_SCREEN_VISIBLE_AREA(0, 495, 0, 231)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 261)
+ MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 231)
- MDRV_GFXDECODE(sprint8)
- MDRV_PALETTE_LENGTH(36)
+ MCFG_GFXDECODE(sprint8)
+ MCFG_PALETTE_LENGTH(36)
- MDRV_PALETTE_INIT(sprint8)
- MDRV_VIDEO_START(sprint8)
- MDRV_VIDEO_UPDATE(sprint8)
- MDRV_VIDEO_EOF(sprint8)
+ MCFG_PALETTE_INIT(sprint8)
+ MCFG_VIDEO_START(sprint8)
+ MCFG_VIDEO_UPDATE(sprint8)
+ MCFG_VIDEO_EOF(sprint8)
/* sound hardware */
/* the proper way is to hook up 4 speakers, but they are not really
* F/R/L/R speakers. Though you can pretend the 1-2 mix is the front. */
- MDRV_SPEAKER_ADD("speaker_1_2", 0.0, 0.0, 1.0) /* front */
- MDRV_SPEAKER_ADD("speaker_3_7", -0.2, 0.0, 1.0) /* left */
- MDRV_SPEAKER_ADD("speaker_5_6", 0.0, 0.0, -0.5) /* back */
- MDRV_SPEAKER_ADD("speaker_4_8", 0.2, 0.0, 1.0) /* right */
-
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(sprint8)
- MDRV_SOUND_ROUTE(0, "speaker_1_2", 1.0)
+ MCFG_SPEAKER_ADD("speaker_1_2", 0.0, 0.0, 1.0) /* front */
+ MCFG_SPEAKER_ADD("speaker_3_7", -0.2, 0.0, 1.0) /* left */
+ MCFG_SPEAKER_ADD("speaker_5_6", 0.0, 0.0, -0.5) /* back */
+ MCFG_SPEAKER_ADD("speaker_4_8", 0.2, 0.0, 1.0) /* right */
+
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(sprint8)
+ MCFG_SOUND_ROUTE(0, "speaker_1_2", 1.0)
/* volumes on other channels defaulted to off, */
/* user can turn them up if needed. */
/* The game does not sound good with all channels mixed to stereo. */
- MDRV_SOUND_ROUTE(1, "speaker_3_7", 0.0)
- MDRV_SOUND_ROUTE(2, "speaker_5_6", 0.0)
- MDRV_SOUND_ROUTE(3, "speaker_4_8", 0.0)
+ MCFG_SOUND_ROUTE(1, "speaker_3_7", 0.0)
+ MCFG_SOUND_ROUTE(2, "speaker_5_6", 0.0)
+ MCFG_SOUND_ROUTE(3, "speaker_4_8", 0.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 2a1d99bea31..7a0c131b44d 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -544,51 +544,51 @@ static MACHINE_RESET( spy )
static MACHINE_CONFIG_START( spy, spy_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(spy_map)
- MDRV_CPU_VBLANK_INT("screen", spy_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(spy_map)
+ MCFG_CPU_VBLANK_INT("screen", spy_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(spy_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(spy_sound_map)
/* nmi by the sound chip */
- MDRV_MACHINE_START(spy)
- MDRV_MACHINE_RESET(spy)
+ MCFG_MACHINE_START(spy)
+ MCFG_MACHINE_RESET(spy)
/* 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 )
+ 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 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(spy)
- MDRV_VIDEO_UPDATE(spy)
+ MCFG_VIDEO_START(spy)
+ MCFG_VIDEO_UPDATE(spy)
- MDRV_K052109_ADD("k052109", spy_k052109_intf)
- MDRV_K051960_ADD("k051960", spy_k051960_intf)
+ MCFG_K052109_ADD("k052109", spy_k052109_intf)
+ MCFG_K051960_ADD("k051960", spy_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("k007232_1", K007232, 3579545)
- MDRV_SOUND_CONFIG(spy_k007232_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
+ MCFG_SOUND_CONFIG(spy_k007232_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD("k007232_2", K007232, 3579545)
- MDRV_SOUND_CONFIG(spy_k007232_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("k007232_2", K007232, 3579545)
+ MCFG_SOUND_CONFIG(spy_k007232_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 9151d123176..7fe02b97a17 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -1011,37 +1011,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( srmp2, srmp2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(srmp2_map)
- MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */
+ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(srmp2_map)
+ MCFG_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */
- MDRV_MACHINE_RESET(srmp2)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(srmp2)
+ 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(464, 256-16)
- MDRV_SCREEN_VISIBLE_AREA(16, 464-1, 8, 256-1-24)
+ 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(464, 256-16)
+ MCFG_SCREEN_VISIBLE_AREA(16, 464-1, 8, 256-1-24)
- MDRV_GFXDECODE(srmp2)
- MDRV_PALETTE_LENGTH(1024) /* sprites only */
+ MCFG_GFXDECODE(srmp2)
+ MCFG_PALETTE_LENGTH(1024) /* sprites only */
- MDRV_PALETTE_INIT(srmp2)
- MDRV_VIDEO_UPDATE(srmp2) /* just draw the sprites */
+ MCFG_PALETTE_INIT(srmp2)
+ MCFG_VIDEO_UPDATE(srmp2) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 20000000/16)
- MDRV_SOUND_CONFIG(srmp2_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, 20000000/16)
+ MCFG_SOUND_CONFIG(srmp2_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -1049,75 +1049,75 @@ static MACHINE_CONFIG_START( srmp3, srmp2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3500000) /* 3.50 MHz ? */
+ MCFG_CPU_ADD("maincpu", Z80, 3500000) /* 3.50 MHz ? */
// 4000000, /* 4.00 MHz ? */
- MDRV_CPU_PROGRAM_MAP(srmp3_map)
- MDRV_CPU_IO_MAP(srmp3_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_PROGRAM_MAP(srmp3_map)
+ MCFG_CPU_IO_MAP(srmp3_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(srmp3)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(srmp3)
+ 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(400, 256-16)
- MDRV_SCREEN_VISIBLE_AREA(16, 400-1, 8, 256-1-24)
+ 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(400, 256-16)
+ MCFG_SCREEN_VISIBLE_AREA(16, 400-1, 8, 256-1-24)
- MDRV_GFXDECODE(srmp3)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(srmp3)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_PALETTE_INIT(srmp3)
- MDRV_VIDEO_UPDATE(srmp3) /* just draw the sprites */
+ MCFG_PALETTE_INIT(srmp3)
+ MCFG_VIDEO_UPDATE(srmp3) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 16000000/16)
- MDRV_SOUND_CONFIG(srmp2_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, 16000000/16)
+ MCFG_SOUND_CONFIG(srmp2_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mjyuugi, srmp2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
- MDRV_CPU_PROGRAM_MAP(mjyuugi_map)
- MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */
+ MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
+ MCFG_CPU_PROGRAM_MAP(mjyuugi_map)
+ MCFG_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */
- MDRV_MACHINE_RESET(srmp2)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(srmp2)
+ 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(400, 256-16)
- MDRV_SCREEN_VISIBLE_AREA(16, 400-1, 0, 256-1-16)
+ 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(400, 256-16)
+ MCFG_SCREEN_VISIBLE_AREA(16, 400-1, 0, 256-1-16)
- MDRV_GFXDECODE(srmp3)
- MDRV_PALETTE_LENGTH(512) /* sprites only */
+ MCFG_GFXDECODE(srmp3)
+ MCFG_PALETTE_LENGTH(512) /* sprites only */
- MDRV_VIDEO_UPDATE(mjyuugi) /* just draw the sprites */
+ MCFG_VIDEO_UPDATE(mjyuugi) /* just draw the sprites */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 16000000/16)
- MDRV_SOUND_CONFIG(srmp2_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("aysnd", AY8910, 16000000/16)
+ MCFG_SOUND_CONFIG(srmp2_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index ccfdabb4475..1bec9f19546 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -556,38 +556,38 @@ GFXDECODE_END
static MACHINE_CONFIG_START( srmp5, srmp5_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000)
- MDRV_CPU_PROGRAM_MAP(st0016_mem)
- MDRV_CPU_IO_MAP(st0016_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,8000000)
+ MCFG_CPU_PROGRAM_MAP(st0016_mem)
+ MCFG_CPU_IO_MAP(st0016_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", R3000LE, 25000000)
- MDRV_CPU_CONFIG(r3000_config)
- MDRV_CPU_PROGRAM_MAP(srmp5_mem)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_assert)
+ MCFG_CPU_ADD("sub", R3000LE, 25000000)
+ MCFG_CPU_CONFIG(r3000_config)
+ MCFG_CPU_PROGRAM_MAP(srmp5_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_assert)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(96*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 2*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(96*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 2*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x1800)
+ MCFG_PALETTE_LENGTH(0x1800)
#ifdef DEBUG_CHAR
- MDRV_GFXDECODE( srmp5 )
+ MCFG_GFXDECODE( srmp5 )
#endif
- MDRV_VIDEO_START(st0016)
- MDRV_VIDEO_UPDATE(srmp5)
+ MCFG_VIDEO_START(st0016)
+ MCFG_VIDEO_UPDATE(srmp5)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("stsnd", ST0016, 0)
- MDRV_SOUND_CONFIG(st0016_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("stsnd", ST0016, 0)
+ MCFG_SOUND_CONFIG(st0016_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
ROM_START( srmp5 )
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index 0b915bd1492..7b5a2ee377a 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -665,29 +665,29 @@ static INTERRUPT_GEN(srmp6_interrupt)
static MACHINE_CONFIG_START( srmp6, srmp6_state )
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(srmp6)
- MDRV_CPU_VBLANK_INT_HACK(srmp6_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(srmp6)
+ MCFG_CPU_VBLANK_INT_HACK(srmp6_interrupt,2)
- 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(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 0*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_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 42*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(srmp6)
- MDRV_VIDEO_UPDATE(srmp6)
+ MCFG_VIDEO_START(srmp6)
+ MCFG_VIDEO_UPDATE(srmp6)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("nile", NILE, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("nile", NILE, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 3d3ebb32273..b188554b0e7 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -234,47 +234,47 @@ GFXDECODE_END
static MACHINE_CONFIG_START( srumbler, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(srumbler_map)
- MDRV_CPU_VBLANK_INT_HACK(srumbler_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(srumbler_map)
+ MCFG_CPU_VBLANK_INT_HACK(srumbler_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(srumbler_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(srumbler_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
- MDRV_MACHINE_RESET(srumbler)
+ MCFG_MACHINE_RESET(srumbler)
/* 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(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(10*8, (64-10)*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(10*8, (64-10)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(srumbler)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(srumbler)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(srumbler)
- MDRV_VIDEO_EOF(srumbler)
- MDRV_VIDEO_UPDATE(srumbler)
+ MCFG_VIDEO_START(srumbler)
+ MCFG_VIDEO_EOF(srumbler)
+ MCFG_VIDEO_UPDATE(srumbler)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.30)
-
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ROUTE(1, "mono", 0.10)
- MDRV_SOUND_ROUTE(2, "mono", 0.10)
- MDRV_SOUND_ROUTE(3, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.30)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ROUTE(1, "mono", 0.10)
+ MCFG_SOUND_ROUTE(2, "mono", 0.10)
+ MCFG_SOUND_ROUTE(3, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index ec7f4c46e3c..8a92a3b5f08 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -596,46 +596,46 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( ssfindo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM7, 54000000) // guess...
- MDRV_CPU_PROGRAM_MAP(ssfindo_map)
+ MCFG_CPU_ADD("maincpu", ARM7, 54000000) // guess...
+ MCFG_CPU_PROGRAM_MAP(ssfindo_map)
- MDRV_CPU_VBLANK_INT("screen", ssfindo_interrupt)
- MDRV_MACHINE_RESET(ssfindo)
+ MCFG_CPU_VBLANK_INT("screen", ssfindo_interrupt)
+ MCFG_MACHINE_RESET(ssfindo)
- 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(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(ssfindo)
+ MCFG_VIDEO_UPDATE(ssfindo)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ppcar, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", ARM7, 54000000) // guess...
- MDRV_CPU_PROGRAM_MAP(ppcar_map)
+ MCFG_CPU_ADD("maincpu", ARM7, 54000000) // guess...
+ MCFG_CPU_PROGRAM_MAP(ppcar_map)
- MDRV_CPU_VBLANK_INT("screen", ssfindo_interrupt)
- MDRV_MACHINE_RESET(ssfindo)
+ MCFG_CPU_VBLANK_INT("screen", ssfindo_interrupt)
+ MCFG_MACHINE_RESET(ssfindo)
- 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(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_UPDATE(ssfindo)
+ MCFG_VIDEO_UPDATE(ssfindo)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 2b9f46cbfa8..d53e8de9cc2 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -345,50 +345,50 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( sshangha, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 28000000/2)
- MDRV_CPU_PROGRAM_MAP(sshangha_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 28000000/2)
+ MCFG_CPU_PROGRAM_MAP(sshangha_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 16000000/4)
- MDRV_CPU_PROGRAM_MAP(sshangha_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 16000000/4)
+ MCFG_CPU_PROGRAM_MAP(sshangha_sound_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET(sshangha) /* init machine */
+ MCFG_MACHINE_RESET(sshangha) /* init machine */
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(sshangha)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(sshangha)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(sshangha)
- MDRV_VIDEO_UPDATE(sshangha)
+ MCFG_VIDEO_START(sshangha)
+ MCFG_VIDEO_UPDATE(sshangha)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* sure it's stereo? */
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* sure it's stereo? */
- MDRV_SOUND_ADD("ymsnd", YM2203, 16000000/4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 16000000/4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
- MDRV_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.27)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.27)
+ MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.27)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.27)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sshanghb, sshangha )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sshanghb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sshanghb_map)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index 1ee28ca7bb1..eda77fa37fc 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -411,36 +411,36 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( ssingles, ssingles_state )
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(ssingles_map)
- MDRV_CPU_IO_MAP(ssingles_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(ssingles_map)
+ MCFG_CPU_IO_MAP(ssingles_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(4000000, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(4000000, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
- MDRV_PALETTE_LENGTH(4) //guess
+ MCFG_PALETTE_LENGTH(4) //guess
- MDRV_VIDEO_START(ssingles)
- MDRV_VIDEO_UPDATE(ssingles)
+ MCFG_VIDEO_START(ssingles)
+ MCFG_VIDEO_UPDATE(ssingles)
- MDRV_MC6845_ADD("crtc", MC6845, 1000000 /* ? MHz */, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, 1000000 /* ? MHz */, mc6845_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000) /* ? MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000) /* ? MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000) /* ? MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000) /* ? MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( atamanot, ssingles )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(atamanot_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(atamanot_map)
MACHINE_CONFIG_END
ROM_START( ssingles )
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index de079c1bf6d..0d3a1c48c08 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -714,63 +714,63 @@ GFXDECODE_END
static MACHINE_CONFIG_START( sslam, sslam_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(sslam_program_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(sslam_program_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", I8051, 12000000)
- MDRV_DEVICE_DISABLE() /* Internal code is not dumped - 2 boards were protected */
+ MCFG_CPU_ADD("audiocpu", I8051, 12000000)
+ MCFG_DEVICE_DISABLE() /* Internal code is not dumped - 2 boards were protected */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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(1*8, 39*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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(1*8, 39*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(sslam)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(sslam)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(sslam)
- MDRV_VIDEO_UPDATE(sslam)
+ MCFG_VIDEO_START(sslam)
+ MCFG_VIDEO_UPDATE(sslam)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( powerbls, sslam_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(powerbls_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(powerbls_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", I80C51, 12000000) /* 83C751 */
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I80C51, 12000000) /* 83C751 */
+ MCFG_CPU_IO_MAP(sound_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(powerbls)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(powerbls)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(powerbls)
- MDRV_VIDEO_UPDATE(powerbls)
+ MCFG_VIDEO_START(powerbls)
+ MCFG_VIDEO_UPDATE(powerbls)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) /* verified on original PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) /* verified on original PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
/* maybe one dump is bad .. which? -> 2nd set was verified good from 2 pcbs */
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index 72c95bbb200..ec3dc579caf 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -176,40 +176,40 @@ GFXDECODE_END
static MACHINE_CONFIG_START( ssozumo, ssozumo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1200000) /* 1.2 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(ssozumo_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6502, 1200000) /* 1.2 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(ssozumo_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */
- MDRV_CPU_PROGRAM_MAP(ssozumo_sound_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,60*16) /* not accurate */
+ MCFG_CPU_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */
+ MCFG_CPU_PROGRAM_MAP(ssozumo_sound_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,60*16) /* not accurate */
/* 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(0*8, 32*8 - 1, 1*8, 31*8 - 1)
+ 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(0*8, 32*8 - 1, 1*8, 31*8 - 1)
- MDRV_GFXDECODE(ssozumo)
- MDRV_PALETTE_LENGTH(64 + 16)
+ MCFG_GFXDECODE(ssozumo)
+ MCFG_PALETTE_LENGTH(64 + 16)
- MDRV_PALETTE_INIT(ssozumo)
- MDRV_VIDEO_START(ssozumo)
- MDRV_VIDEO_UPDATE(ssozumo)
+ MCFG_PALETTE_INIT(ssozumo)
+ MCFG_VIDEO_START(ssozumo)
+ MCFG_VIDEO_UPDATE(ssozumo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- 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/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index f9e06745311..d17e33fbfa4 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -189,26 +189,26 @@ GFXDECODE_END
static MACHINE_CONFIG_START( sspeedr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8)
- MDRV_CPU_PROGRAM_MAP(sspeedr_map)
- MDRV_CPU_IO_MAP(sspeedr_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8)
+ MCFG_CPU_PROGRAM_MAP(sspeedr_map)
+ MCFG_CPU_IO_MAP(sspeedr_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.39)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(16 * 1000000 / 15680))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(376, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 375, 0, 247)
-
- MDRV_GFXDECODE(sspeedr)
- MDRV_PALETTE_LENGTH(16)
-
- MDRV_PALETTE_INIT(sspeedr)
- MDRV_VIDEO_START(sspeedr)
- MDRV_VIDEO_UPDATE(sspeedr)
- MDRV_VIDEO_EOF(sspeedr)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.39)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(16 * 1000000 / 15680))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(376, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 375, 0, 247)
+
+ MCFG_GFXDECODE(sspeedr)
+ MCFG_PALETTE_LENGTH(16)
+
+ MCFG_PALETTE_INIT(sspeedr)
+ MCFG_VIDEO_START(sspeedr)
+ MCFG_VIDEO_UPDATE(sspeedr)
+ MCFG_VIDEO_EOF(sspeedr)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index c5c77e9e1a5..25fbefd70bc 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -144,34 +144,34 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( ssrj, ssrj_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(ssrj_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(ssrj_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(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 30*8-1, 3*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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 30*8-1, 3*8, 32*8-1)
- MDRV_GFXDECODE(ssrj)
- MDRV_PALETTE_LENGTH(128)
- MDRV_PALETTE_INIT(ssrj)
+ MCFG_GFXDECODE(ssrj)
+ MCFG_PALETTE_LENGTH(128)
+ MCFG_PALETTE_INIT(ssrj)
- MDRV_VIDEO_START(ssrj)
- MDRV_VIDEO_UPDATE(ssrj)
-// MDRV_ASPECT_RATIO(3,4)
+ MCFG_VIDEO_START(ssrj)
+ MCFG_VIDEO_UPDATE(ssrj)
+// MCFG_ASPECT_RATIO(3,4)
- MDRV_MACHINE_RESET(ssrj)
+ MCFG_MACHINE_RESET(ssrj)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/5)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 8000000/5)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c
index 20a71a8e7cc..296e6d345ba 100644
--- a/src/mame/drivers/sstrangr.c
+++ b/src/mame/drivers/sstrangr.c
@@ -194,19 +194,19 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( sstrangr, sstrangr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",I8080,1996800) /* clock is a guess, taken from mw8080bw */
- MDRV_CPU_PROGRAM_MAP(sstrangr_map)
- MDRV_CPU_IO_MAP(sstrangr_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("maincpu",I8080,1996800) /* clock is a guess, taken from mw8080bw */
+ MCFG_CPU_PROGRAM_MAP(sstrangr_map)
+ MCFG_CPU_IO_MAP(sstrangr_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
/* video hardware */
- MDRV_VIDEO_UPDATE(sstrangr)
+ MCFG_VIDEO_UPDATE(sstrangr)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 262) /* vert size is a guess, taken from mw8080bw */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 262) /* vert size is a guess, taken from mw8080bw */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
/* sound hardware */
@@ -268,7 +268,7 @@ static MACHINE_CONFIG_DERIVED( sstrngr2, sstrangr )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_UPDATE(sstrngr2)
+ MCFG_VIDEO_UPDATE(sstrngr2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 27a47517e40..24bae27dd0a 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -2672,208 +2672,208 @@ static DRIVER_INIT( jsk ) { init_ssv(machine, 0); }
static MACHINE_CONFIG_START( ssv, ssv_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V60, 16000000) /* Based on STA-0001 & STA-0001B System boards */
- MDRV_CPU_VBLANK_INT_HACK(ssv_interrupt,2) /* Vblank */
+ MCFG_CPU_ADD("maincpu", V60, 16000000) /* Based on STA-0001 & STA-0001B System boards */
+ MCFG_CPU_VBLANK_INT_HACK(ssv_interrupt,2) /* Vblank */
- MDRV_MACHINE_RESET(ssv)
+ MCFG_MACHINE_RESET(ssv)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(0x1c6, 0x106)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x150-1, 0, 0xf0-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(0x1c6, 0x106)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x150-1, 0, 0xf0-1)
- MDRV_GFXDECODE(ssv)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_VIDEO_START(ssv)
- MDRV_VIDEO_UPDATE(ssv)
+ MCFG_GFXDECODE(ssv)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_VIDEO_START(ssv)
+ MCFG_VIDEO_UPDATE(ssv)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ensoniq", ES5506, 16000000)
- MDRV_SOUND_CONFIG(es5506_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ensoniq", ES5506, 16000000)
+ MCFG_SOUND_CONFIG(es5506_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( drifto94, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(drifto94_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(drifto94_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcd-0x25)*2-1, 0, (0x101-0x13)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcd-0x25)*2-1, 0, (0x101-0x13)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gdfs, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gdfs_map)
- MDRV_CPU_VBLANK_INT_HACK(gdfs_interrupt,1+4)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gdfs_map)
+ MCFG_CPU_VBLANK_INT_HACK(gdfs_interrupt,1+4)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd5-0x2c)*2-1, 0, (0x102-0x12)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd5-0x2c)*2-1, 0, (0x102-0x12)-1)
- MDRV_GFXDECODE(gdfs)
- MDRV_VIDEO_START(gdfs)
- MDRV_VIDEO_UPDATE(gdfs)
+ MCFG_GFXDECODE(gdfs)
+ MCFG_VIDEO_START(gdfs)
+ MCFG_VIDEO_UPDATE(gdfs)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hypreact, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hypreact_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hypreact_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcb-0x22)*2-1, 0, (0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcb-0x22)*2-1, 0, (0xfe - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hypreac2, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(hypreac2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(hypreac2_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcb-0x22)*2-1, 0, (0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcb-0x22)*2-1, 0, (0xfe - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( janjans1, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(janjans1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(janjans1_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcb-0x23)*2-1, 0, (0xfe - 0x0f)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcb-0x23)*2-1, 0, (0xfe - 0x0f)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( keithlcy, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(keithlcy_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(keithlcy_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcd-0x25)*2-1, 0, (0x101 - 0x13)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcd-0x25)*2-1, 0, (0x101 - 0x13)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( meosism, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(meosism_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(meosism_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd5-0x2c)*2-1, 0, (0xfe - 0x12)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd5-0x2c)*2-1, 0, (0xfe - 0x12)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mslider, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mslider_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mslider_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd6-0x26)*2-1, 0, (0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd6-0x26)*2-1, 0, (0xfe - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ryorioh, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ryorioh_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ryorioh_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcb-0x23)*2-1, 0, (0xfe - 0x0f)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcb-0x23)*2-1, 0, (0xfe - 0x0f)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vasara, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ryorioh_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ryorioh_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcc-0x24)*2-1, 0,(0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcc-0x24)*2-1, 0,(0xfe - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( srmp4, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(srmp4_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(srmp4_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd4-0x2c)*2-1, 0, (0x102 - 0x12)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd4-0x2c)*2-1, 0, (0x102 - 0x12)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( srmp7, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(srmp7_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(srmp7_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd4-0x2c)*2-1, 0, (0xfd - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd4-0x2c)*2-1, 0, (0xfd - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( stmblade, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(drifto94_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(drifto94_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd6-0x26)*2-1, 0, (0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd6-0x26)*2-1, 0, (0xfe - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( survarts, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(survarts_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(survarts_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd4-0x2c)*2-1, 0, (0x102 - 0x12)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd4-0x2c)*2-1, 0, (0x102 - 0x12)-1)
MACHINE_CONFIG_END
@@ -2881,103 +2881,103 @@ static MACHINE_CONFIG_DERIVED( dynagear, survarts )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd4-0x2c)*2-1, 0, (0x102 - 0x12)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd4-0x2c)*2-1, 0, (0x102 - 0x12)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( eaglshot, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(eaglshot_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(eaglshot_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xca - 0x2a)*2-1, 0, (0xf6 - 0x16)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xca - 0x2a)*2-1, 0, (0xf6 - 0x16)-1)
- MDRV_GFXDECODE(eaglshot)
- MDRV_VIDEO_START(eaglshot)
- MDRV_VIDEO_UPDATE(eaglshot)
+ MCFG_GFXDECODE(eaglshot)
+ MCFG_VIDEO_START(eaglshot)
+ MCFG_VIDEO_UPDATE(eaglshot)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sxyreact, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sxyreact_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sxyreact_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcb - 0x22)*2-1, 0, (0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcb - 0x22)*2-1, 0, (0xfe - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sxyreac2, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sxyreact_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sxyreact_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcb - 0x23)*2-1, 0, (0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcb - 0x23)*2-1, 0, (0xfe - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cairblad, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sxyreact_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sxyreact_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xcb - 0x22)*2-1, 0, (0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xcb - 0x22)*2-1, 0, (0xfe - 0x0e)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( twineag2, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(twineag2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(twineag2_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd4 - 0x2c)*2-1, 0, (0x102 - 0x12)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd4 - 0x2c)*2-1, 0, (0x102 - 0x12)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ultrax, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ultrax_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ultrax_map)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xd4 - 0x2c)*2-1, 0, (0x102 - 0x12)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xd4 - 0x2c)*2-1, 0, (0x102 - 0x12)-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jsk, ssv )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(jsk_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(jsk_map)
- MDRV_CPU_ADD("sub", V810,25000000)
- MDRV_CPU_PROGRAM_MAP(jsk_v810_mem)
+ MCFG_CPU_ADD("sub", V810,25000000)
+ MCFG_CPU_PROGRAM_MAP(jsk_v810_mem)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, (0xca - 0x22)*2-1, 0, (0xfe - 0x0e)-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, (0xca - 0x22)*2-1, 0, (0xfe - 0x0e)-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index 9dec4a9efa2..7c65021e935 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -432,40 +432,40 @@ static const st0016_interface st0016_config =
static MACHINE_CONFIG_START( st0016, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000) /* 8 MHz ? */
- MDRV_CPU_PROGRAM_MAP(st0016_mem)
- MDRV_CPU_IO_MAP(st0016_io)
+ MCFG_CPU_ADD("maincpu",Z80,8000000) /* 8 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(st0016_mem)
+ MCFG_CPU_IO_MAP(st0016_io)
- MDRV_CPU_VBLANK_INT_HACK(st0016_int,5) /* 4*nmi + int0 */
+ MCFG_CPU_VBLANK_INT_HACK(st0016_int,5) /* 4*nmi + int0 */
/* 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(48*8, 48*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 48*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(48*8, 48*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 48*8-1)
- MDRV_GFXDECODE(st0016)
- MDRV_PALETTE_LENGTH(16*16*4+1)
+ MCFG_GFXDECODE(st0016)
+ MCFG_PALETTE_LENGTH(16*16*4+1)
- MDRV_VIDEO_START(st0016)
- MDRV_VIDEO_UPDATE(st0016)
+ MCFG_VIDEO_START(st0016)
+ MCFG_VIDEO_UPDATE(st0016)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("stsnd", ST0016, 0)
- MDRV_SOUND_CONFIG(st0016_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("stsnd", ST0016, 0)
+ MCFG_SOUND_CONFIG(st0016_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mayjinsn, st0016 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(st0016_m2_io)
- MDRV_CPU_ADD("sub", V810, 10000000)//25 Mhz ?
- MDRV_CPU_PROGRAM_MAP(v810_mem)
- MDRV_QUANTUM_TIME(HZ(60))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(st0016_m2_io)
+ MCFG_CPU_ADD("sub", V810, 10000000)//25 Mhz ?
+ MCFG_CPU_PROGRAM_MAP(v810_mem)
+ MCFG_QUANTUM_TIME(HZ(60))
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 4b17c8b2b35..042f979c70d 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -305,14 +305,14 @@ static MACHINE_START( stactics )
static MACHINE_CONFIG_START( stactics, stactics_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, 1933560)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", stactics_interrupt)
+ MCFG_CPU_ADD("maincpu", I8080, 1933560)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", stactics_interrupt)
- MDRV_MACHINE_START(stactics)
+ MCFG_MACHINE_START(stactics)
/* video hardware */
- MDRV_FRAGMENT_ADD(stactics_video)
+ MCFG_FRAGMENT_ADD(stactics_video)
/* audio hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 869938d94f9..346a46b97bf 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -211,42 +211,42 @@ static const ym3812_interface ym3812_config =
static MACHINE_CONFIG_START( stadhero, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", M6502, 1500000)
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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)
- MDRV_GFXDECODE(stadhero)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(stadhero)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(stadhero)
- MDRV_VIDEO_UPDATE(stadhero)
+ MCFG_VIDEO_START(stadhero)
+ MCFG_VIDEO_UPDATE(stadhero)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.95)
- MDRV_SOUND_ROUTE(1, "mono", 0.95)
- MDRV_SOUND_ROUTE(2, "mono", 0.95)
- MDRV_SOUND_ROUTE(3, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.95)
+ MCFG_SOUND_ROUTE(1, "mono", 0.95)
+ MCFG_SOUND_ROUTE(2, "mono", 0.95)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index 1d84ddaa387..719da81069b 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -137,32 +137,32 @@ static const samples_interface starcrus_samples_interface =
static MACHINE_CONFIG_START( starcrus, starcrus_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080,9750000/9) /* 8224 chip is a divide by 9 */
- MDRV_CPU_PROGRAM_MAP(starcrus_map)
- MDRV_CPU_IO_MAP(starcrus_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", I8080,9750000/9) /* 8224 chip is a divide by 9 */
+ MCFG_CPU_PROGRAM_MAP(starcrus_map)
+ MCFG_CPU_IO_MAP(starcrus_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- 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(0*8, 32*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ 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(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(starcrus)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(starcrus)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(starcrus)
- MDRV_VIDEO_UPDATE(starcrus)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(starcrus)
+ MCFG_VIDEO_UPDATE(starcrus)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(starcrus_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(starcrus_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index c7cb934fefe..651856ccfa1 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -264,17 +264,17 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( starfire, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, STARFIRE_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, STARFIRE_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(STARFIRE_PIXEL_CLOCK, STARFIRE_HTOTAL, STARFIRE_HBEND, STARFIRE_HBSTART, STARFIRE_VTOTAL, STARFIRE_VBEND, STARFIRE_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(STARFIRE_PIXEL_CLOCK, STARFIRE_HTOTAL, STARFIRE_HBEND, STARFIRE_HBSTART, STARFIRE_VTOTAL, STARFIRE_VBEND, STARFIRE_VBSTART)
- MDRV_VIDEO_START(starfire)
- MDRV_VIDEO_UPDATE(starfire)
+ MCFG_VIDEO_START(starfire)
+ MCFG_VIDEO_UPDATE(starfire)
/* audio hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index b769b67058d..6e6ca14e481 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -297,31 +297,31 @@ static MACHINE_CONFIG_START( starshp1, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, STARSHP1_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(starshp1_map)
- MDRV_CPU_VBLANK_INT("screen", starshp1_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, STARSHP1_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(starshp1_map)
+ MCFG_CPU_VBLANK_INT("screen", starshp1_interrupt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(STARSHP1_PIXEL_CLOCK, STARSHP1_HTOTAL, STARSHP1_HBEND, STARSHP1_HBSTART, STARSHP1_VTOTAL, STARSHP1_VBEND, STARSHP1_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(STARSHP1_PIXEL_CLOCK, STARSHP1_HTOTAL, STARSHP1_HBEND, STARSHP1_HBSTART, STARSHP1_VTOTAL, STARSHP1_VBEND, STARSHP1_VBSTART)
- MDRV_GFXDECODE(starshp1)
- MDRV_PALETTE_LENGTH(19)
- MDRV_PALETTE_INIT(starshp1)
+ MCFG_GFXDECODE(starshp1)
+ MCFG_PALETTE_LENGTH(19)
+ MCFG_PALETTE_INIT(starshp1)
- MDRV_VIDEO_START(starshp1)
- MDRV_VIDEO_UPDATE(starshp1)
- MDRV_VIDEO_EOF(starshp1)
+ MCFG_VIDEO_START(starshp1)
+ MCFG_VIDEO_UPDATE(starshp1)
+ MCFG_VIDEO_EOF(starshp1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(starshp1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(starshp1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 7be07bdc197..ac0aa5a9ea3 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -324,47 +324,47 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( starwars, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
- MDRV_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 128))
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
+ MCFG_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 128))
- MDRV_CPU_ADD("audiocpu", M6809, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_RESET(starwars)
+ MCFG_MACHINE_RESET(starwars)
- MDRV_RIOT6532_ADD("riot", MASTER_CLOCK / 8, starwars_riot6532_intf)
+ MCFG_RIOT6532_ADD("riot", MASTER_CLOCK / 8, starwars_riot6532_intf)
- MDRV_X2212_ADD_AUTOSAVE("x2212") /* nvram */
+ MCFG_X2212_ADD_AUTOSAVE("x2212") /* nvram */
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(40)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 250, 0, 280)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(40)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 250, 0, 280)
- MDRV_VIDEO_START(avg_starwars)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(avg_starwars)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SOUND_START(starwars)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_START(starwars)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("pokey3", POKEY, MASTER_CLOCK / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("pokey3", POKEY, MASTER_CLOCK / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("pokey4", POKEY, MASTER_CLOCK / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("pokey4", POKEY, MASTER_CLOCK / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("tms", TMS5220, MASTER_CLOCK/2/9)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("tms", TMS5220, MASTER_CLOCK/2/9)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 2d305ef7e45..bea82b2449b 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -588,54 +588,54 @@ static const tms9927_interface tms9927_intf =
static MACHINE_CONFIG_START( statriv2, statriv2_state )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
- MDRV_CPU_ADD("maincpu", I8085A, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(statriv2_map)
- MDRV_CPU_IO_MAP(statriv2_io_map)
- MDRV_CPU_VBLANK_INT("screen", statriv2_interrupt)
+ MCFG_CPU_ADD("maincpu", I8085A, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(statriv2_map)
+ MCFG_CPU_IO_MAP(statriv2_io_map)
+ MCFG_CPU_VBLANK_INT("screen", statriv2_interrupt)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* 1x 8255 */
- MDRV_PPI8255_ADD("ppi", ppi8255_intf)
+ MCFG_PPI8255_ADD("ppi", ppi8255_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 320, 270, 0, 240)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 320, 270, 0, 240)
- MDRV_TMS9927_ADD("tms", MASTER_CLOCK/2, tms9927_intf)
+ MCFG_TMS9927_ADD("tms", MASTER_CLOCK/2, tms9927_intf)
- MDRV_GFXDECODE(horizontal)
- MDRV_PALETTE_LENGTH(2*64)
+ MCFG_GFXDECODE(horizontal)
+ MCFG_PALETTE_LENGTH(2*64)
- MDRV_PALETTE_INIT(statriv2)
- MDRV_VIDEO_START(horizontal)
- MDRV_VIDEO_UPDATE(statriv2)
+ MCFG_PALETTE_INIT(statriv2)
+ MCFG_VIDEO_START(horizontal)
+ MCFG_VIDEO_UPDATE(statriv2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( statriv2v, statriv2 )
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 392, 0, 256, 262, 0, 256)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 392, 0, 256, 262, 0, 256)
- MDRV_VIDEO_START(vertical)
- MDRV_GFXDECODE(vertical)
+ MCFG_VIDEO_START(vertical)
+ MCFG_GFXDECODE(vertical)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( funcsino, statriv2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(MASTER_CLOCK/2) /* 3 MHz?? seems accurate */
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(MASTER_CLOCK/2) /* 3 MHz?? seems accurate */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c
index ce4bb192aa4..c0e5817c874 100644
--- a/src/mame/drivers/stepstag.c
+++ b/src/mame/drivers/stepstag.c
@@ -110,41 +110,41 @@ static VIDEO_UPDATE(stepstag)
static MACHINE_CONFIG_START( stepstag, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000 ) //??
- MDRV_CPU_PROGRAM_MAP(stepstag_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold) // 4 & 6 valid
+ MCFG_CPU_ADD("maincpu", M68000, 16000000 ) //??
+ MCFG_CPU_PROGRAM_MAP(stepstag_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold) // 4 & 6 valid
- MDRV_CPU_ADD("sub", M68000, 16000000 ) //??
- MDRV_CPU_PROGRAM_MAP(stepstag_sub_map)
+ MCFG_CPU_ADD("sub", M68000, 16000000 ) //??
+ MCFG_CPU_PROGRAM_MAP(stepstag_sub_map)
/* video hardware */
- MDRV_SCREEN_ADD("lscreen", 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, 32*8-1, 0*8, 32*8-1)
-
- 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, 32*8-1, 0*8, 32*8-1)
-
- MDRV_SCREEN_ADD("rscreen", 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, 32*8-1, 0*8, 32*8-1)
-
- MDRV_PALETTE_LENGTH(0x200)
- MDRV_GFXDECODE(stepstag)
- MDRV_DEFAULT_LAYOUT(layout_stepstag)
-
- MDRV_VIDEO_START(stepstag)
- MDRV_VIDEO_UPDATE(stepstag)
+ MCFG_SCREEN_ADD("lscreen", 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, 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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", 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, 32*8-1, 0*8, 32*8-1)
+
+ MCFG_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(stepstag)
+ MCFG_DEFAULT_LAYOUT(layout_stepstag)
+
+ MCFG_VIDEO_START(stepstag)
+ MCFG_VIDEO_UPDATE(stepstag)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index e7eb19c26f3..a09d1ef18a5 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -434,51 +434,51 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( stfight, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3000000) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", stfight_vb_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 3000000) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", stfight_vb_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,120)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,120)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(stfight)
+ MCFG_MACHINE_RESET(stfight)
/* 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)
+ 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)
- MDRV_GFXDECODE(stfight)
- MDRV_PALETTE_LENGTH(16*4+16*16+16*16+16*16)
+ MCFG_GFXDECODE(stfight)
+ MCFG_PALETTE_LENGTH(16*4+16*16+16*16+16*16)
- MDRV_PALETTE_INIT(stfight)
- MDRV_VIDEO_START(stfight)
- MDRV_VIDEO_UPDATE(stfight)
+ MCFG_PALETTE_INIT(stfight)
+ MCFG_VIDEO_START(stfight)
+ MCFG_VIDEO_UPDATE(stfight)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- 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, 3000000)
- 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("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ 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, 3000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.10)
+
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 76e9a01e265..c7b72bf62f9 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -186,41 +186,41 @@ GFXDECODE_END
static MACHINE_CONFIG_START( stlforce, stlforce_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 15000000)
- MDRV_CPU_PROGRAM_MAP(stlforce_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 15000000)
+ MCFG_CPU_PROGRAM_MAP(stlforce_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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(1*8, 47*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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(1*8, 47*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(stlforce)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(stlforce)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(stlforce)
- MDRV_VIDEO_UPDATE(stlforce)
+ MCFG_VIDEO_START(stlforce)
+ MCFG_VIDEO_UPDATE(stlforce)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 937500 , OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 937500 , OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( twinbrat, stlforce )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(14745600)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(14745600)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(3*8, 45*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(3*8, 45*8-1, 0*8, 30*8-1)
MACHINE_CONFIG_END
ROM_START( stlforce )
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index 9a55e43d624..0f7a2fa14c3 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -318,45 +318,45 @@ GFXDECODE_END
static MACHINE_CONFIG_START( strnskil, strnskil_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(strnskil_map1)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
+ MCFG_CPU_PROGRAM_MAP(strnskil_map1)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MDRV_CPU_PROGRAM_MAP(strnskil_map2)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
+ MCFG_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
+ MCFG_CPU_PROGRAM_MAP(strnskil_map2)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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(1*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(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(strnskil)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(strnskil)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(strnskil)
- MDRV_VIDEO_START(strnskil)
- MDRV_VIDEO_UPDATE(strnskil)
+ MCFG_PALETTE_INIT(strnskil)
+ MCFG_VIDEO_START(strnskil)
+ MCFG_VIDEO_UPDATE(strnskil)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 8000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("sn1", SN76496, 8000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD("sn2", SN76496, 8000000/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("sn2", SN76496, 8000000/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( banbam, strnskil )
- MDRV_CPU_ADD("mcu", MB8841, 8000000/2)
- MDRV_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_ADD("mcu", MB8841, 8000000/2)
+ MCFG_CPU_IO_MAP(mcu_io_map)
MACHINE_CONFIG_END
/****************************************************************************/
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 991173f6c70..ff489b964c9 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -113,7 +113,7 @@ ToDo / Notes:
(per-game issues)
-stress: accesses the Sound Memory Expansion Area (0x05a00000-0x05afffff), unknown purpose;
--smleague / finlarch: it randomly hangs / crashes,it works if you use a ridiculous MDRV_INTERLEAVE number,might need strict
+-smleague / finlarch: it randomly hangs / crashes,it works if you use a ridiculous MCFG_INTERLEAVE number,might need strict
SH-2 synching.
-various: find idle skip if possible.
-suikoenb/shanhigw + others: why do we get 2 credits on startup? Cause might be by a communication with the M68k
@@ -2855,47 +2855,47 @@ static MACHINE_RESET( stv )
static MACHINE_CONFIG_START( stv, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
- MDRV_CPU_PROGRAM_MAP(stv_mem)
- MDRV_CPU_VBLANK_INT("screen",stv_interrupt)
- MDRV_CPU_CONFIG(sh2_conf_master)
+ MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
+ MCFG_CPU_PROGRAM_MAP(stv_mem)
+ MCFG_CPU_VBLANK_INT("screen",stv_interrupt)
+ MCFG_CPU_CONFIG(sh2_conf_master)
- MDRV_CPU_ADD("slave", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
- MDRV_CPU_PROGRAM_MAP(stv_mem)
- MDRV_CPU_CONFIG(sh2_conf_slave)
+ MCFG_CPU_ADD("slave", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
+ MCFG_CPU_PROGRAM_MAP(stv_mem)
+ MCFG_CPU_CONFIG(sh2_conf_slave)
- MDRV_CPU_ADD("audiocpu", M68000, MASTER_CLOCK_352/5) //11.46 MHz
- MDRV_CPU_PROGRAM_MAP(sound_mem)
+ MCFG_CPU_ADD("audiocpu", M68000, MASTER_CLOCK_352/5) //11.46 MHz
+ MCFG_CPU_PROGRAM_MAP(sound_mem)
- MDRV_MACHINE_START(stv)
- MDRV_MACHINE_RESET(stv)
+ MCFG_MACHINE_START(stv)
+ MCFG_MACHINE_RESET(stv)
- MDRV_EEPROM_93C46_ADD("eeprom") /* Actually 93c45 */
+ MCFG_EEPROM_93C46_ADD("eeprom") /* Actually 93c45 */
- MDRV_TIMER_ADD("scan_timer", hblank_in_irq)
- MDRV_TIMER_ADD("t1_timer", timer1_irq)
- MDRV_TIMER_ADD("vbout_timer", vblank_out_irq)
- MDRV_TIMER_ADD("sector_timer", stv_sector_cb)
+ MCFG_TIMER_ADD("scan_timer", hblank_in_irq)
+ MCFG_TIMER_ADD("t1_timer", timer1_irq)
+ MCFG_TIMER_ADD("vbout_timer", vblank_out_irq)
+ MCFG_TIMER_ADD("sector_timer", stv_sector_cb)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 400, 0, 320, 262, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB15)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 400, 0, 320, 262, 0, 224)
- MDRV_PALETTE_LENGTH(2048+(2048*2))//standard palette + extra memory for rgb brightness.
- MDRV_GFXDECODE(stv)
+ MCFG_PALETTE_LENGTH(2048+(2048*2))//standard palette + extra memory for rgb brightness.
+ MCFG_GFXDECODE(stv)
- MDRV_VIDEO_START(stv_vdp2)
- MDRV_VIDEO_UPDATE(stv_vdp2)
+ MCFG_VIDEO_START(stv_vdp2)
+ MCFG_VIDEO_UPDATE(stv_vdp2)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("scsp", SCSP, 0)
- MDRV_SOUND_CONFIG(scsp_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("scsp", SCSP, 0)
+ MCFG_SOUND_CONFIG(scsp_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
#define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \
diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c
index 35ffb66e1a8..1740c0b027f 100644
--- a/src/mame/drivers/sub.c
+++ b/src/mame/drivers/sub.c
@@ -420,40 +420,40 @@ static INTERRUPT_GEN( subm_sound_irq )
static MACHINE_CONFIG_START( sub, sub_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(subm_map)
- MDRV_CPU_IO_MAP(subm_io)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(subm_map)
+ MCFG_CPU_IO_MAP(subm_io)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80,MASTER_CLOCK/6) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(subm_sound_map)
- MDRV_CPU_IO_MAP(subm_sound_io)
- MDRV_CPU_PERIODIC_INT(subm_sound_irq, 120) //???
+ MCFG_CPU_ADD("soundcpu", Z80,MASTER_CLOCK/6) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(subm_sound_map)
+ MCFG_CPU_IO_MAP(subm_sound_io)
+ MCFG_CPU_PERIODIC_INT(subm_sound_irq, 120) //???
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
- MDRV_GFXDECODE(sub)
- MDRV_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(sub)
+ MCFG_GFXDECODE(sub)
+ MCFG_PALETTE_LENGTH(0x400)
+ MCFG_PALETTE_INIT(sub)
- MDRV_VIDEO_START(sub)
- MDRV_VIDEO_UPDATE(sub)
+ MCFG_VIDEO_START(sub)
+ MCFG_VIDEO_UPDATE(sub)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/6/2) /* ? Mhz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/6/2) /* ? Mhz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MDRV_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/6/2) /* ? Mhz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
+ MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/6/2) /* ? Mhz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index a454729d354..c70465ae9e7 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -178,41 +178,41 @@ GFXDECODE_END
static MACHINE_CONFIG_START( subs, subs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,12096000/16) /* clock input is the "4H" signal */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(subs_interrupt,4)
+ MCFG_CPU_ADD("maincpu", M6502,12096000/16) /* clock input is the "4H" signal */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(subs_interrupt,4)
- MDRV_MACHINE_RESET(subs)
+ MCFG_MACHINE_RESET(subs)
/* video hardware */
- MDRV_GFXDECODE(subs)
- MDRV_PALETTE_LENGTH(4)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
-
- MDRV_PALETTE_INIT(subs)
- MDRV_VIDEO_UPDATE(subs)
+ MCFG_GFXDECODE(subs)
+ MCFG_PALETTE_LENGTH(4)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
+
+ MCFG_PALETTE_INIT(subs)
+ MCFG_VIDEO_UPDATE(subs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(subs)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(subs)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 9532b7e1e84..c2579b8ad14 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -2560,171 +2560,171 @@ GFXDECODE_END
static MACHINE_CONFIG_START( victor21, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
- MDRV_CPU_PROGRAM_MAP(victor21_map)
- MDRV_CPU_IO_MAP(subsino_iomap)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
+ MCFG_CPU_PROGRAM_MAP(victor21_map)
+ MCFG_CPU_IO_MAP(subsino_iomap)
/* 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+16, 256-16-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+16, 256-16-1)
- MDRV_GFXDECODE(subsino_depth3)
+ MCFG_GFXDECODE(subsino_depth3)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(subsino_2proms)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(subsino_2proms)
- MDRV_VIDEO_START(subsino)
- MDRV_VIDEO_UPDATE(subsino)
+ MCFG_VIDEO_START(subsino)
+ MCFG_VIDEO_UPDATE(subsino)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, OKIM6295_PIN7_HIGH) /* Clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, OKIM6295_PIN7_HIGH) /* Clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* same but with an additional protection. */
static MACHINE_CONFIG_DERIVED( victor5, victor21 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(victor5_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(victor5_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( crsbingo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */
- MDRV_CPU_PROGRAM_MAP(crsbingo_map)
- MDRV_CPU_IO_MAP(subsino_iomap)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */
+ MCFG_CPU_PROGRAM_MAP(crsbingo_map)
+ MCFG_CPU_IO_MAP(subsino_iomap)
/* 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+16, 256-16-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+16, 256-16-1)
- MDRV_GFXDECODE(subsino_depth4)
+ MCFG_GFXDECODE(subsino_depth4)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(subsino_2proms)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(subsino_2proms)
- MDRV_VIDEO_START(subsino)
- MDRV_VIDEO_UPDATE(subsino)
+ MCFG_VIDEO_START(subsino)
+ MCFG_VIDEO_UPDATE(subsino)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) /* Unknown clock */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz) /* Unknown clock */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( srider, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
- MDRV_CPU_PROGRAM_MAP(srider_map)
- MDRV_CPU_IO_MAP(subsino_iomap)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
+ MCFG_CPU_PROGRAM_MAP(srider_map)
+ MCFG_CPU_IO_MAP(subsino_iomap)
/* 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+16, 256-16-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+16, 256-16-1)
- MDRV_GFXDECODE(subsino_depth4)
+ MCFG_GFXDECODE(subsino_depth4)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(subsino_3proms)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(subsino_3proms)
- MDRV_VIDEO_START(subsino)
- MDRV_VIDEO_UPDATE(subsino)
+ MCFG_VIDEO_START(subsino)
+ MCFG_VIDEO_UPDATE(subsino)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, OKIM6295_PIN7_HIGH) /* Clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, OKIM6295_PIN7_HIGH) /* Clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sharkpy, srider )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(sharkpy_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(sharkpy_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tisub, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */
- MDRV_CPU_PROGRAM_MAP(tisub_map)
- MDRV_CPU_IO_MAP(subsino_iomap)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */
+ MCFG_CPU_PROGRAM_MAP(tisub_map)
+ MCFG_CPU_IO_MAP(subsino_iomap)
/* 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+16, 256-16-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+16, 256-16-1)
- MDRV_GFXDECODE(subsino_depth4_reels)
+ MCFG_GFXDECODE(subsino_depth4_reels)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(subsino_3proms)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(subsino_3proms)
- MDRV_VIDEO_START(subsino_reels)
- MDRV_VIDEO_UPDATE(subsino_reels)
+ MCFG_VIDEO_START(subsino_reels)
+ MCFG_VIDEO_UPDATE(subsino_reels)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz) /* Unknown clock */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz) /* Unknown clock */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( stisub, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
- MDRV_CPU_PROGRAM_MAP(stisub_map)
- MDRV_CPU_IO_MAP(subsino_iomap)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
+ MCFG_CPU_PROGRAM_MAP(stisub_map)
+ MCFG_CPU_IO_MAP(subsino_iomap)
/* 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+16, 256-16-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+16, 256-16-1)
- MDRV_GFXDECODE(subsino_stisub)
+ MCFG_GFXDECODE(subsino_stisub)
- MDRV_PALETTE_LENGTH(0x100)
- //MDRV_PALETTE_INIT(subsino_3proms)
+ MCFG_PALETTE_LENGTH(0x100)
+ //MCFG_PALETTE_INIT(subsino_3proms)
- MDRV_VIDEO_START(stisub)
- MDRV_VIDEO_UPDATE(stisub_reels)
+ MCFG_VIDEO_START(stisub)
+ MCFG_VIDEO_UPDATE(stisub_reels)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
VIDEO_START(mtrain)
@@ -2739,34 +2739,34 @@ VIDEO_UPDATE(mtrain)
static MACHINE_CONFIG_START( mtrain, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
- MDRV_CPU_PROGRAM_MAP(mtrain_map)
- MDRV_CPU_IO_MAP(subsino_iomap)
+ MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
+ MCFG_CPU_PROGRAM_MAP(mtrain_map)
+ MCFG_CPU_IO_MAP(subsino_iomap)
/* 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+16, 256-16-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+16, 256-16-1)
- MDRV_GFXDECODE(subsino_mtrain)
+ MCFG_GFXDECODE(subsino_mtrain)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(subsino_3proms)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(subsino_3proms)
- MDRV_VIDEO_START(mtrain)
- MDRV_VIDEO_UPDATE(mtrain)
+ MCFG_VIDEO_START(mtrain)
+ MCFG_VIDEO_UPDATE(mtrain)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, OKIM6295_PIN7_HIGH) /* Clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, 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/suna16.c b/src/mame/drivers/suna16.c
index c371a5ea23b..f660456b060 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -752,55 +752,55 @@ static INTERRUPT_GEN( bssoccer_interrupt )
static MACHINE_CONFIG_START( bssoccer, suna16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(bssoccer_map)
- MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(bssoccer_map)
+ MCFG_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(bssoccer_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* Z80B */
+ MCFG_CPU_PROGRAM_MAP(bssoccer_sound_map)
- MDRV_CPU_ADD("pcm1", Z80, 5000000) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
- MDRV_CPU_IO_MAP(bssoccer_pcm_1_io_map)
+ MCFG_CPU_ADD("pcm1", Z80, 5000000) /* Z80B */
+ MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
+ MCFG_CPU_IO_MAP(bssoccer_pcm_1_io_map)
- MDRV_CPU_ADD("pcm2", Z80, 5000000) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_2_map)
- MDRV_CPU_IO_MAP(bssoccer_pcm_2_io_map)
+ MCFG_CPU_ADD("pcm2", Z80, 5000000) /* Z80B */
+ MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_2_map)
+ MCFG_CPU_IO_MAP(bssoccer_pcm_2_io_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(suna16)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(suna16)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(suna16)
- MDRV_VIDEO_UPDATE(suna16)
+ MCFG_VIDEO_START(suna16)
+ MCFG_VIDEO_UPDATE(suna16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MDRV_SOUND_ADD("dac3", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ADD("dac3", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ADD("dac4", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac4", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
@@ -812,49 +812,49 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( uballoon, suna16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(uballoon_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(uballoon_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(uballoon_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
+ MCFG_CPU_PROGRAM_MAP(uballoon_sound_map)
- MDRV_CPU_ADD("pcm1", Z80, 5000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(uballoon_pcm_1_map)
- MDRV_CPU_IO_MAP(uballoon_pcm_1_io_map)
+ MCFG_CPU_ADD("pcm1", Z80, 5000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(uballoon_pcm_1_map)
+ MCFG_CPU_IO_MAP(uballoon_pcm_1_io_map)
/* 2nd PCM Z80 missing */
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET(uballoon)
+ MCFG_MACHINE_RESET(uballoon)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(suna16)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(suna16)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(suna16)
- MDRV_VIDEO_UPDATE(suna16)
+ MCFG_VIDEO_START(suna16)
+ MCFG_VIDEO_UPDATE(suna16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
/***************************************************************************
@@ -864,47 +864,47 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sunaq, suna16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 24000000/4)
- MDRV_CPU_PROGRAM_MAP(sunaq_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 24000000/4)
+ MCFG_CPU_PROGRAM_MAP(sunaq_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 14318000/4)
- MDRV_CPU_PROGRAM_MAP(sunaq_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 14318000/4)
+ MCFG_CPU_PROGRAM_MAP(sunaq_sound_map)
- MDRV_CPU_ADD("pcm1", Z80, 24000000/4) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
- MDRV_CPU_IO_MAP(bssoccer_pcm_1_io_map)
+ MCFG_CPU_ADD("pcm1", Z80, 24000000/4) /* Z80B */
+ MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
+ MCFG_CPU_IO_MAP(bssoccer_pcm_1_io_map)
/* 2nd PCM Z80 missing */
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(suna16)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(suna16)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(suna16)
- MDRV_VIDEO_UPDATE(suna16)
+ MCFG_VIDEO_START(suna16)
+ MCFG_VIDEO_UPDATE(suna16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 14318000/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 14318000/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
/***************************************************************************
@@ -937,59 +937,59 @@ static const ay8910_interface bestbest_ay8910_interface =
static MACHINE_CONFIG_START( bestbest, suna16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 24000000/4)
- MDRV_CPU_PROGRAM_MAP(bestbest_map)
- MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 24000000/4)
+ MCFG_CPU_PROGRAM_MAP(bestbest_map)
+ MCFG_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 24000000/4)
- MDRV_CPU_PROGRAM_MAP(bestbest_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 24000000/4)
+ MCFG_CPU_PROGRAM_MAP(bestbest_sound_map)
- MDRV_CPU_ADD("pcm1", Z80, 24000000/4)
- MDRV_CPU_PROGRAM_MAP(bestbest_pcm_1_map)
- MDRV_CPU_IO_MAP(bestbest_pcm_1_iomap)
+ MCFG_CPU_ADD("pcm1", Z80, 24000000/4)
+ MCFG_CPU_PROGRAM_MAP(bestbest_pcm_1_map)
+ MCFG_CPU_IO_MAP(bestbest_pcm_1_iomap)
/* 2nd PCM Z80 missing */
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.1734) // measured on pcb (15.6218kHz HSync)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.1734) // measured on pcb (15.6218kHz HSync)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(bestbest)
- MDRV_PALETTE_LENGTH(256*8)
+ MCFG_GFXDECODE(bestbest)
+ MCFG_PALETTE_LENGTH(256*8)
- MDRV_VIDEO_START(suna16)
- MDRV_VIDEO_UPDATE(bestbest)
+ MCFG_VIDEO_START(suna16)
+ MCFG_VIDEO_UPDATE(bestbest)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("aysnd", AY8910, 24000000/16)
- MDRV_SOUND_CONFIG(bestbest_ay8910_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, 24000000/16)
+ MCFG_SOUND_CONFIG(bestbest_ay8910_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("ymsnd", YM3526, 24000000/8)
- MDRV_SOUND_CONFIG(bestbest_ym3526_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, 24000000/8)
+ MCFG_SOUND_CONFIG(bestbest_ym3526_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MDRV_SOUND_ADD("dac3", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ADD("dac3", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ADD("dac4", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac4", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index a238305c5ec..5dc926143c0 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1497,46 +1497,46 @@ static const samples_interface suna8_samples_interface =
static MACHINE_CONFIG_START( hardhead, suna8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(hardhead_map)
- MDRV_CPU_IO_MAP(hardhead_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* No NMI */
+ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(hardhead_map)
+ MCFG_CPU_IO_MAP(hardhead_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* No NMI */
- MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(hardhead_sound_map)
- MDRV_CPU_IO_MAP(hardhead_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
+ MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(hardhead_sound_map)
+ MCFG_CPU_IO_MAP(hardhead_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.10) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.10) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(suna8)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(suna8)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(suna8_textdim12)
- MDRV_VIDEO_UPDATE(suna8)
+ MCFG_VIDEO_START(suna8_textdim12)
+ MCFG_VIDEO_UPDATE(suna8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
- MDRV_SOUND_CONFIG(hardhead_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
+ MCFG_SOUND_CONFIG(hardhead_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(suna8_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(suna8_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -1563,45 +1563,45 @@ static const ym2203_interface rranger_ym2203_interface =
static MACHINE_CONFIG_START( rranger, suna8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(rranger_map)
- MDRV_CPU_IO_MAP(rranger_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ & NMI ! */
+ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(rranger_map)
+ MCFG_CPU_IO_MAP(rranger_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ & NMI ! */
- MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(rranger_sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMI = retn */
+ MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(rranger_sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMI = retn */
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(suna8)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(suna8)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(suna8_textdim8)
- MDRV_VIDEO_UPDATE(suna8)
+ MCFG_VIDEO_START(suna8_textdim8)
+ MCFG_VIDEO_UPDATE(suna8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ym1", YM2203, SUNA8_MASTER_CLOCK / 6)
- MDRV_SOUND_CONFIG(rranger_ym2203_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ym1", YM2203, SUNA8_MASTER_CLOCK / 6)
+ MCFG_SOUND_CONFIG(rranger_ym2203_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
- MDRV_SOUND_ADD("ym2", YM2203, SUNA8_MASTER_CLOCK / 6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
+ MCFG_SOUND_ADD("ym2", YM2203, SUNA8_MASTER_CLOCK / 6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(suna8_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(suna8_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -1625,55 +1625,55 @@ static INTERRUPT_GEN( brickzn_interrupt )
static MACHINE_CONFIG_START( brickzn, suna8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA PROTECTION BLOCK */
- MDRV_CPU_PROGRAM_MAP(brickzn_map)
-// MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt, 2)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // nmi breaks ramtest but is needed!
+ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA PROTECTION BLOCK */
+ MCFG_CPU_PROGRAM_MAP(brickzn_map)
+// MCFG_CPU_VBLANK_INT_HACK(brickzn_interrupt, 2)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) // nmi breaks ramtest but is needed!
- MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC */
- MDRV_CPU_PROGRAM_MAP(brickzn_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC */
+ MCFG_CPU_PROGRAM_MAP(brickzn_sound_map)
- MDRV_CPU_ADD("pcm", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC */
- MDRV_CPU_PROGRAM_MAP(brickzn_pcm_map)
- MDRV_CPU_IO_MAP(brickzn_pcm_io_map)
+ MCFG_CPU_ADD("pcm", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC */
+ MCFG_CPU_PROGRAM_MAP(brickzn_pcm_map)
+ MCFG_CPU_IO_MAP(brickzn_pcm_io_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // we're using IPT_VBLANK
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(suna8)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(suna8)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(suna8_textdim0)
- MDRV_VIDEO_UPDATE(suna8)
+ MCFG_VIDEO_START(suna8_textdim0)
+ MCFG_VIDEO_UPDATE(suna8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6)
- MDRV_SOUND_CONFIG(brickzn_ym3812_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6)
+ MCFG_SOUND_CONFIG(brickzn_ym3812_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
+ MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.17)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.17)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.17)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.17)
- MDRV_SOUND_ADD("dac3", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.17)
+ MCFG_SOUND_ADD("dac3", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.17)
- MDRV_SOUND_ADD("dac4", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.17)
+ MCFG_SOUND_ADD("dac4", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.17)
MACHINE_CONFIG_END
@@ -1700,12 +1700,12 @@ static MACHINE_RESET( hardhea2 )
}
static MACHINE_CONFIG_DERIVED( hardhea2, brickzn )
- MDRV_CPU_MODIFY("maincpu") /* SUNA T568009 */
- MDRV_CPU_PROGRAM_MAP(hardhea2_map)
- MDRV_CPU_VBLANK_INT_HACK(hardhea2_interrupt,2) /* IRQ & NMI */
+ MCFG_CPU_MODIFY("maincpu") /* SUNA T568009 */
+ MCFG_CPU_PROGRAM_MAP(hardhea2_map)
+ MCFG_CPU_VBLANK_INT_HACK(hardhea2_interrupt,2) /* IRQ & NMI */
- MDRV_MACHINE_RESET(hardhea2)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_MACHINE_RESET(hardhea2)
+ MCFG_PALETTE_LENGTH(256)
MACHINE_CONFIG_END
@@ -1726,46 +1726,46 @@ static const ay8910_interface starfigh_ay8910_interface =
static MACHINE_CONFIG_START( starfigh, suna8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(starfigh_map)
- MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt,2) /* IRQ & NMI */
+ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(starfigh_map)
+ MCFG_CPU_VBLANK_INT_HACK(brickzn_interrupt,2) /* IRQ & NMI */
/* The sound section is identical to that of hardhead */
- MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(hardhead_sound_map)
- MDRV_CPU_IO_MAP(hardhead_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
+ MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(hardhead_sound_map)
+ MCFG_CPU_IO_MAP(hardhead_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(suna8)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(suna8)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(suna8_textdim0)
- MDRV_VIDEO_UPDATE(suna8)
+ MCFG_VIDEO_START(suna8_textdim0)
+ MCFG_VIDEO_UPDATE(suna8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
- MDRV_SOUND_CONFIG(starfigh_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
+ MCFG_SOUND_CONFIG(starfigh_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(suna8_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(suna8_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -1786,45 +1786,45 @@ static INTERRUPT_GEN( sparkman_interrupt )
static MACHINE_CONFIG_START( sparkman, suna8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(sparkman_map)
- MDRV_CPU_VBLANK_INT_HACK(sparkman_interrupt,2) /* IRQ & NMI */
+ MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sparkman_map)
+ MCFG_CPU_VBLANK_INT_HACK(sparkman_interrupt,2) /* IRQ & NMI */
- MDRV_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MDRV_CPU_PROGRAM_MAP(hardhead_sound_map)
- MDRV_CPU_IO_MAP(hardhead_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
+ MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_CPU_PROGRAM_MAP(hardhead_sound_map)
+ MCFG_CPU_IO_MAP(hardhead_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(suna8)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(suna8)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(suna8_textdim0)
- MDRV_VIDEO_UPDATE(suna8)
+ MCFG_VIDEO_START(suna8_textdim0)
+ MCFG_VIDEO_UPDATE(suna8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
- MDRV_SOUND_CONFIG(hardhead_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
+ MCFG_SOUND_CONFIG(hardhead_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(suna8_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(suna8_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index c6fe373fd09..e21e2090433 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -342,84 +342,84 @@ static MACHINE_START( supbtime )
static MACHINE_CONFIG_START( supbtime, supbtime_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(supbtime_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(supbtime_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(supbtime)
+ MCFG_MACHINE_START(supbtime)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(supbtime)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(supbtime)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_UPDATE(supbtime)
+ MCFG_VIDEO_UPDATE(supbtime)
- MDRV_DECO16IC_ADD("deco_custom", supbtime_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", supbtime_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( chinatwn, supbtime_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(chinatwn_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(chinatwn_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(supbtime)
+ MCFG_MACHINE_START(supbtime)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(supbtime)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(supbtime)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_UPDATE(supbtime)
+ MCFG_VIDEO_UPDATE(supbtime)
- MDRV_DECO16IC_ADD("deco_custom", supbtime_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", supbtime_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1023924, 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/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 86776dc281b..76df1afff67 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -432,35 +432,35 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( supdrapo, supdrapo_state )
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
- MDRV_CPU_PROGRAM_MAP(sdpoker_mem)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
+ MCFG_CPU_PROGRAM_MAP(sdpoker_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(supdrapo)
- MDRV_MACHINE_RESET(supdrapo)
+ MCFG_MACHINE_START(supdrapo)
+ MCFG_MACHINE_RESET(supdrapo)
- 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(256, 256)
- 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(supdrapo)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(sdpoker)
+ MCFG_GFXDECODE(supdrapo)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(sdpoker)
- MDRV_VIDEO_START(supdrapo)
- MDRV_VIDEO_UPDATE(supdrapo)
+ MCFG_VIDEO_START(supdrapo)
+ MCFG_VIDEO_UPDATE(supdrapo)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, SND_CLOCK) /* guess */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, SND_CLOCK) /* guess */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 19abb2bbe2a..4aff99ab3b7 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -371,36 +371,36 @@ static const tc0480scp_interface superchs_tc0480scp_intf =
static MACHINE_CONFIG_START( superchs, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(superchs_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(superchs_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)/* VBL */
- MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(superchs_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
+ MCFG_CPU_ADD("sub", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(superchs_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)/* VBL */
- MDRV_QUANTUM_TIME(HZ(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
+ MCFG_QUANTUM_TIME(HZ(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
- MDRV_EEPROM_ADD("eeprom", superchs_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", superchs_eeprom_interface)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(superchs)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(superchs)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(superchs)
- MDRV_VIDEO_UPDATE(superchs)
+ MCFG_VIDEO_START(superchs)
+ MCFG_VIDEO_UPDATE(superchs)
- MDRV_TC0480SCP_ADD("tc0480scp", superchs_tc0480scp_intf)
+ MCFG_TC0480SCP_ADD("tc0480scp", superchs_tc0480scp_intf)
/* sound hardware */
- MDRV_FRAGMENT_ADD(taito_f3_sound)
+ MCFG_FRAGMENT_ADD(taito_f3_sound)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index 6654bc9e58e..3b41be64fc0 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -325,35 +325,35 @@ static MACHINE_START( superdq )
static MACHINE_CONFIG_START( superdq, superdq_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(superdq_map)
- MDRV_CPU_IO_MAP(superdq_io)
- MDRV_CPU_VBLANK_INT("screen", superdq_vblank)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(superdq_map)
+ MCFG_CPU_IO_MAP(superdq_io)
+ MCFG_CPU_VBLANK_INT("screen", superdq_vblank)
- MDRV_MACHINE_START(superdq)
- MDRV_MACHINE_RESET(superdq)
+ MCFG_MACHINE_START(superdq)
+ MCFG_MACHINE_RESET(superdq)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(superdq, 256, 256, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(superdq, 256, 256, BITMAP_FORMAT_INDEXED16)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(superdq)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(superdq)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(superdq)
- MDRV_VIDEO_START(superdq)
+ MCFG_PALETTE_INIT(superdq)
+ MCFG_VIDEO_START(superdq)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.8)
+ MCFG_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.8)
- 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
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 7aeedeb31e2..a42b792f09c 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -1012,157 +1012,157 @@ static INTERRUPT_GEN( bootleg_interrupt )
static MACHINE_CONFIG_START( pbillian, driver_device )
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(pbillian_port_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(pbillian_port_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(pbillian)
+ MCFG_MACHINE_START(pbillian)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pbillian)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(pbillian)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(pbillian)
- MDRV_VIDEO_UPDATE(pbillian)
+ MCFG_VIDEO_START(pbillian)
+ MCFG_VIDEO_UPDATE(pbillian)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(pbillian_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(pbillian_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(pbillian_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(pbillian_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hotsmash, driver_device )
- MDRV_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(hotsmash_port_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(hotsmash_port_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("mcu", M68705, 4000000) /* ???? */
- MDRV_CPU_PROGRAM_MAP(m68705_map)
+ MCFG_CPU_ADD("mcu", M68705, 4000000) /* ???? */
+ MCFG_CPU_PROGRAM_MAP(m68705_map)
- MDRV_MACHINE_START(pbillian)
+ MCFG_MACHINE_START(pbillian)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pbillian)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(pbillian)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(pbillian)
- MDRV_VIDEO_UPDATE(pbillian)
+ MCFG_VIDEO_START(pbillian)
+ MCFG_VIDEO_UPDATE(pbillian)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(hotsmash_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(hotsmash_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(pbillian_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(pbillian_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sqix, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(sqix_port_map)
- MDRV_CPU_VBLANK_INT_HACK(sqix_interrupt,6) /* ??? */
+ MCFG_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(sqix_port_map)
+ MCFG_CPU_VBLANK_INT_HACK(sqix_interrupt,6) /* ??? */
- MDRV_CPU_ADD("mcu", I8751, 12000000/3) /* ??? */
- MDRV_CPU_IO_MAP(bootleg_mcu_io_map)
+ MCFG_CPU_ADD("mcu", I8751, 12000000/3) /* ??? */
+ MCFG_CPU_IO_MAP(bootleg_mcu_io_map)
- MDRV_QUANTUM_TIME(HZ(30000))
+ MCFG_QUANTUM_TIME(HZ(30000))
- MDRV_MACHINE_START(superqix)
+ MCFG_MACHINE_START(superqix)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(sqix)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(sqix)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(superqix)
- MDRV_VIDEO_UPDATE(superqix)
+ MCFG_VIDEO_START(superqix)
+ MCFG_VIDEO_UPDATE(superqix)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(sqix_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(sqix_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(sqix_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(sqix_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sqixu, sqix )
- MDRV_CPU_MODIFY("mcu")
- MDRV_CPU_IO_MAP(sqixu_mcu_io_map)
+ MCFG_CPU_MODIFY("mcu")
+ MCFG_CPU_IO_MAP(sqixu_mcu_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sqixbl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(bootleg_port_map)
- MDRV_CPU_VBLANK_INT_HACK(bootleg_interrupt,6) /* ??? */
+ MCFG_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(bootleg_port_map)
+ MCFG_CPU_VBLANK_INT_HACK(bootleg_interrupt,6) /* ??? */
- MDRV_MACHINE_START(superqix)
+ MCFG_MACHINE_START(superqix)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(sqix)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(sqix)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(superqix)
- MDRV_VIDEO_UPDATE(superqix)
+ MCFG_VIDEO_START(superqix)
+ MCFG_VIDEO_UPDATE(superqix)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(bootleg_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(bootleg_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 12000000/8)
- MDRV_SOUND_CONFIG(bootleg_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 12000000/8)
+ MCFG_SOUND_CONFIG(bootleg_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 51960149606..b73872ff576 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -423,29 +423,29 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( supertnk, supertnk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS9980, 2598750) /* ? to which frequency is the 20.79 Mhz crystal mapped down? */
- MDRV_CPU_PROGRAM_MAP(supertnk_map)
- MDRV_CPU_IO_MAP(supertnk_io_map)
- MDRV_CPU_VBLANK_INT("screen", supertnk_interrupt)
+ MCFG_CPU_ADD("maincpu", TMS9980, 2598750) /* ? to which frequency is the 20.79 Mhz crystal mapped down? */
+ MCFG_CPU_PROGRAM_MAP(supertnk_map)
+ MCFG_CPU_IO_MAP(supertnk_io_map)
+ MCFG_CPU_VBLANK_INT("screen", supertnk_interrupt)
- MDRV_MACHINE_RESET(supertnk)
+ MCFG_MACHINE_RESET(supertnk)
/* video hardware */
- MDRV_VIDEO_START(supertnk)
- MDRV_VIDEO_UPDATE(supertnk)
+ MCFG_VIDEO_START(supertnk)
+ MCFG_VIDEO_UPDATE(supertnk)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index b5e563f1bd9..77f65c2ad0c 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -484,37 +484,37 @@ static MACHINE_RESET( suprgolf )
static MACHINE_CONFIG_START( suprgolf, suprgolf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* guess */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* guess */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_VIDEO_START(suprgolf)
- MDRV_VIDEO_UPDATE(suprgolf)
+ MCFG_VIDEO_START(suprgolf)
+ MCFG_VIDEO_UPDATE(suprgolf)
- MDRV_MACHINE_RESET(suprgolf)
+ MCFG_MACHINE_RESET(suprgolf)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 191)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 191)
- MDRV_GFXDECODE(suprgolf)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(suprgolf)
+ MCFG_PALETTE_LENGTH(0x800)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000) /* guess */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000) /* guess */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_SOUND_ADD("msm", MSM5205, 400000) /* guess */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("msm", MSM5205, 400000) /* guess */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index ee0b1da1220..15eeea9729e 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -155,37 +155,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( suprloco, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMIs are caused by the main CPU */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMIs are caused by the main CPU */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(5000))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(suprloco)
- MDRV_PALETTE_LENGTH(512+256)
+ MCFG_GFXDECODE(suprloco)
+ MCFG_PALETTE_LENGTH(512+256)
- MDRV_PALETTE_INIT(suprloco)
- MDRV_VIDEO_START(suprloco)
- MDRV_VIDEO_UPDATE(suprloco)
+ MCFG_PALETTE_INIT(suprloco)
+ MCFG_VIDEO_START(suprloco)
+ MCFG_VIDEO_UPDATE(suprloco)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76496, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76496, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 97e04592eb9..97df676ef39 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -832,44 +832,44 @@ static const ymz280b_interface ymz280b_intf =
};
static MACHINE_CONFIG_START( skns, driver_device )
- MDRV_CPU_ADD("maincpu", SH2,28638000)
- MDRV_CPU_PROGRAM_MAP(skns_map)
- MDRV_CPU_VBLANK_INT_HACK(skns_interrupt,2)
+ MCFG_CPU_ADD("maincpu", SH2,28638000)
+ MCFG_CPU_PROGRAM_MAP(skns_map)
+ MCFG_CPU_VBLANK_INT_HACK(skns_interrupt,2)
- MDRV_MACHINE_RESET(skns)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(skns)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_TIMER_ADD_PERIODIC("int15_timer", interrupt_callback, MSEC(2))
- MDRV_TIMER_PARAM(15)
- MDRV_TIMER_ADD_PERIODIC("int11_timer", interrupt_callback, MSEC(8))
- MDRV_TIMER_PARAM(11)
- MDRV_TIMER_ADD_PERIODIC("int9_timer", interrupt_callback, HZ(28638000/1824))
- MDRV_TIMER_PARAM(9)
+ MCFG_TIMER_ADD_PERIODIC("int15_timer", interrupt_callback, MSEC(2))
+ MCFG_TIMER_PARAM(15)
+ MCFG_TIMER_ADD_PERIODIC("int11_timer", interrupt_callback, MSEC(8))
+ MCFG_TIMER_PARAM(11)
+ MCFG_TIMER_ADD_PERIODIC("int9_timer", interrupt_callback, HZ(28638000/1824))
+ MCFG_TIMER_PARAM(9)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.5971) // measured by Guru
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(320,240)
- MDRV_SCREEN_VISIBLE_AREA(0,319,0,239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.5971) // measured by Guru
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(320,240)
+ MCFG_SCREEN_VISIBLE_AREA(0,319,0,239)
- MDRV_PALETTE_LENGTH(32768)
- MDRV_GFXDECODE(skns_bg)
+ MCFG_PALETTE_LENGTH(32768)
+ MCFG_GFXDECODE(skns_bg)
- MDRV_VIDEO_START(skns)
- MDRV_VIDEO_RESET(skns)
- MDRV_VIDEO_EOF(skns)
- MDRV_VIDEO_UPDATE(skns)
+ MCFG_VIDEO_START(skns)
+ MCFG_VIDEO_RESET(skns)
+ MCFG_VIDEO_EOF(skns)
+ MCFG_VIDEO_UPDATE(skns)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 33333333 / 2)
- MDRV_SOUND_CONFIG(ymz280b_intf)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 33333333 / 2)
+ MCFG_SOUND_CONFIG(ymz280b_intf)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***** BIOS SKIPPING *****/
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 6dcc25c365f..49f7ea1a112 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -357,39 +357,39 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( suprridr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_49_152MHz/16) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", main_nmi_gen)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_49_152MHz/16) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", main_nmi_gen)
- MDRV_CPU_ADD("audiocpu", Z80, 10000000/4) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 10000000/4) /* 2.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
/* 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)
+ 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)
- MDRV_GFXDECODE(suprridr)
- MDRV_PALETTE_LENGTH(96)
+ MCFG_GFXDECODE(suprridr)
+ MCFG_PALETTE_LENGTH(96)
- MDRV_PALETTE_INIT(suprridr)
- MDRV_VIDEO_START(suprridr)
- MDRV_VIDEO_UPDATE(suprridr)
+ MCFG_PALETTE_INIT(suprridr)
+ MCFG_VIDEO_START(suprridr)
+ MCFG_VIDEO_UPDATE(suprridr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_49_152MHz/32)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_49_152MHz/32)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_49_152MHz/32)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_49_152MHz/32)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 934c9b59df4..4b42c951aee 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -319,43 +319,43 @@ static MACHINE_RESET( suprslam )
static MACHINE_CONFIG_START( suprslam, suprslam_state )
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(suprslam_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(suprslam_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_MACHINE_START(suprslam)
- MDRV_MACHINE_RESET(suprslam)
+ MCFG_MACHINE_START(suprslam)
+ MCFG_MACHINE_RESET(suprslam)
- MDRV_GFXDECODE(suprslam)
+ MCFG_GFXDECODE(suprslam)
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2300) /* hand-tuned */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2300) /* hand-tuned */)
+ 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)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(suprslam)
- MDRV_VIDEO_UPDATE(suprslam)
+ MCFG_VIDEO_START(suprslam)
+ MCFG_VIDEO_UPDATE(suprslam)
- MDRV_K053936_ADD("k053936", suprslam_k053936_intf)
+ MCFG_K053936_ADD("k053936", suprslam_k053936_intf)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_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_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
/*** ROM LOADING *************************************************************/
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 463c2b302cb..b8e036a330d 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -241,38 +241,38 @@ static MACHINE_RESET( surpratk )
static MACHINE_CONFIG_START( surpratk, surpratk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */
- MDRV_CPU_PROGRAM_MAP(surpratk_map)
- MDRV_CPU_VBLANK_INT("screen", surpratk_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */
+ MCFG_CPU_PROGRAM_MAP(surpratk_map)
+ MCFG_CPU_VBLANK_INT("screen", surpratk_interrupt)
- MDRV_MACHINE_START(surpratk)
- MDRV_MACHINE_RESET(surpratk)
+ MCFG_MACHINE_START(surpratk)
+ MCFG_MACHINE_RESET(surpratk)
/* 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(14*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(surpratk)
+ MCFG_VIDEO_UPDATE(surpratk)
- MDRV_K052109_ADD("k052109", surpratk_k052109_intf)
- MDRV_K053244_ADD("k053244", surpratk_k05324x_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", surpratk_k052109_intf)
+ MCFG_K053244_ADD("k053244", surpratk_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 14839b85fdf..1239e906e1d 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -2102,49 +2102,49 @@ static Z80PIO_INTERFACE( pio_interface )
static MACHINE_CONFIG_START( sys1ppi, system1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* not really, see notes above */
- MDRV_CPU_PROGRAM_MAP(system1_map)
- MDRV_CPU_IO_MAP(system1_ppi_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* not really, see notes above */
+ MCFG_CPU_PROGRAM_MAP(system1_map)
+ MCFG_CPU_IO_MAP(system1_ppi_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_TIMER_ADD_SCANLINE("soundirq", soundirq_gen, "screen", 32, 64)
+ MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_TIMER_ADD_SCANLINE("soundirq", soundirq_gen, "screen", 32, 64)
- MDRV_MACHINE_START(system1)
- MDRV_MACHINE_RESET(system1)
+ MCFG_MACHINE_START(system1)
+ MCFG_MACHINE_RESET(system1)
- MDRV_PPI8255_ADD("ppi", ppi_interface)
+ MCFG_PPI8255_ADD("ppi", ppi_interface)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) /* needed for proper hardware collisions */
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) /* needed for proper hardware collisions */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 320, 0, 256, 260, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4, 320, 0, 256, 260, 0, 224)
- MDRV_GFXDECODE(system1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(system1)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(system1)
- MDRV_VIDEO_UPDATE(system1)
+ MCFG_VIDEO_START(system1)
+ MCFG_VIDEO_UPDATE(system1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489A, SOUND_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76489A, SOUND_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76489A, SOUND_CLOCK/2) /* selectable via jumper */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76489A, SOUND_CLOCK/2) /* selectable via jumper */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/* reduced visible area for scrolling games */
static MACHINE_CONFIG_DERIVED( sys1ppis, sys1ppi )
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8+8, 32*8-1-8, 0*8, 28*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8+8, 32*8-1-8, 0*8, 28*8-1)
MACHINE_CONFIG_END
@@ -2152,19 +2152,19 @@ MACHINE_CONFIG_END
/* revised board with 128kbit ROMs and a Z80 PIO for outputs */
static MACHINE_CONFIG_DERIVED( sys1pio, sys1ppi )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(system1_pio_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(system1_pio_io_map)
- MDRV_DEVICE_REMOVE("ppi")
- MDRV_Z80PIO_ADD("pio", MASTER_CLOCK, pio_interface)
+ MCFG_DEVICE_REMOVE("ppi")
+ MCFG_Z80PIO_ADD("pio", MASTER_CLOCK, pio_interface)
MACHINE_CONFIG_END
/* reduced visible area for scrolling games */
static MACHINE_CONFIG_DERIVED( sys1pios, sys1pio )
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8+8, 32*8-1-8, 0*8, 28*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8+8, 32*8-1-8, 0*8, 28*8-1)
MACHINE_CONFIG_END
@@ -2173,14 +2173,14 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( mcu )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT(NULL, NULL)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT(NULL, NULL)
- MDRV_CPU_ADD("mcu", I8751, SOUND_CLOCK)
- MDRV_CPU_IO_MAP(mcu_io_map)
- MDRV_CPU_VBLANK_INT("screen", mcu_irq_assert)
+ MCFG_CPU_ADD("mcu", I8751, SOUND_CLOCK)
+ MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_VBLANK_INT("screen", mcu_irq_assert)
- MDRV_TIMER_ADD_PERIODIC("mcu_t0", mcu_t0_callback, MSEC(20)) /* ??? actual clock unknown */
+ MCFG_TIMER_ADD_PERIODIC("mcu_t0", mcu_t0_callback, MSEC(20)) /* ??? actual clock unknown */
MACHINE_CONFIG_END
@@ -2189,15 +2189,15 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nob, sys1ppi )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nobo_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(nobo_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( nobm, nob )
/* basic machine hardware */
- MDRV_CPU_ADD("mcu", I8751, SOUND_CLOCK)
- MDRV_CPU_IO_MAP(nob_mcu_io_map)
+ MCFG_CPU_ADD("mcu", I8751, SOUND_CLOCK)
+ MCFG_CPU_IO_MAP(nob_mcu_io_map)
MACHINE_CONFIG_END
@@ -2205,26 +2205,26 @@ MACHINE_CONFIG_END
/* system2 video */
static MACHINE_CONFIG_DERIVED( sys2, sys1ppi )
- MDRV_MACHINE_START(system2)
+ MCFG_MACHINE_START(system2)
/* video hardware */
- MDRV_VIDEO_START(system2)
- MDRV_VIDEO_UPDATE(system2)
+ MCFG_VIDEO_START(system2)
+ MCFG_VIDEO_UPDATE(system2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys2m, sys2 )
- MDRV_FRAGMENT_ADD( mcu )
+ MCFG_FRAGMENT_ADD( mcu )
MACHINE_CONFIG_END
/* system2 with rowscroll */
static MACHINE_CONFIG_DERIVED( sys2row, sys2 )
/* video hardware */
- MDRV_VIDEO_UPDATE(system2_rowscroll)
+ MCFG_VIDEO_UPDATE(system2_rowscroll)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sys2rowm, sys2row )
- MDRV_FRAGMENT_ADD( mcu )
+ MCFG_FRAGMENT_ADD( mcu )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 2ed88b5200d..87fb331082b 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -2049,33 +2049,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( system16, segas1x_bootleg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_VBLANK_INT("screen", sys16_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_VBLANK_INT("screen", sys16_interrupt)
- MDRV_CPU_ADD("soundcpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
/* 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(40*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*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(40*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(sys16)
- MDRV_PALETTE_LENGTH(2048*SHADOW_COLORS_MULTIPLIER)
+ MCFG_GFXDECODE(sys16)
+ MCFG_PALETTE_LENGTH(2048*SHADOW_COLORS_MULTIPLIER)
- MDRV_VIDEO_START(system16)
- MDRV_VIDEO_UPDATE(system16)
+ MCFG_VIDEO_START(system16)
+ MCFG_VIDEO_UPDATE(system16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.32)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.32)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.32)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.32)
MACHINE_CONFIG_END
@@ -2098,15 +2098,15 @@ static MACHINE_CONFIG_DERIVED( system16_7759, system16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(sound_7759_map)
- MDRV_CPU_IO_MAP(sound_7759_io_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(sound_7759_map)
+ MCFG_CPU_IO_MAP(sound_7759_io_map)
/* sound hardware */
- MDRV_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_CONFIG(sys16_upd7759_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.48)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48)
+ MCFG_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_CONFIG(sys16_upd7759_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.48)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48)
MACHINE_CONFIG_END
@@ -2116,20 +2116,20 @@ static MACHINE_CONFIG_FRAGMENT( system16_datsu_sound )
- speaker is likely to be mono for the bootlegs, not stereo.
- check msm5205 frequency.
*/
- MDRV_CPU_ADD("soundcpu",Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(tturfbl_sound_map)
- MDRV_CPU_IO_MAP(tturfbl_sound_io_map)
+ MCFG_CPU_ADD("soundcpu",Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(tturfbl_sound_map)
+ MCFG_CPU_IO_MAP(tturfbl_sound_io_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.32)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.32)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.32)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.32)
- MDRV_SOUND_ADD("5205", MSM5205, 220000)
- MDRV_SOUND_CONFIG(tturfbl_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("5205", MSM5205, 220000)
+ MCFG_SOUND_CONFIG(tturfbl_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -2146,13 +2146,13 @@ static const sega16sp_interface shinobld_sega16sp_intf =
static MACHINE_CONFIG_DERIVED( shinobib, system16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shinobib_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(shinobib_map)
- MDRV_SEGA16SP_ADD("segaspr1", shinobld_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", shinobld_sega16sp_intf)
- MDRV_VIDEO_START( s16a_bootleg_shinobi )
- MDRV_VIDEO_UPDATE( s16a_bootleg )
+ MCFG_VIDEO_START( s16a_bootleg_shinobi )
+ MCFG_VIDEO_UPDATE( s16a_bootleg )
MACHINE_CONFIG_END
static const sega16sp_interface passshtb_sega16sp_intf =
@@ -2168,27 +2168,27 @@ static const sega16sp_interface passshtb_sega16sp_intf =
static MACHINE_CONFIG_DERIVED( passshtb, system16_7759 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(passshtb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(passshtb_map)
- MDRV_SEGA16SP_ADD("segaspr1", passshtb_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", passshtb_sega16sp_intf)
- MDRV_VIDEO_START( s16a_bootleg_passsht )
- MDRV_VIDEO_UPDATE( s16a_bootleg )
+ MCFG_VIDEO_START( s16a_bootleg_passsht )
+ MCFG_VIDEO_UPDATE( s16a_bootleg )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( passsht4b, system16_7759 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(passht4b_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(passht4b_map)
// wrong
- MDRV_SEGA16SP_ADD("segaspr1", passshtb_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", passshtb_sega16sp_intf)
- MDRV_VIDEO_START( s16a_bootleg_passsht )
- MDRV_VIDEO_UPDATE( s16a_bootleg_passht4b )
+ MCFG_VIDEO_START( s16a_bootleg_passsht )
+ MCFG_VIDEO_UPDATE( s16a_bootleg_passht4b )
MACHINE_CONFIG_END
static const sega16sp_interface wb3bbl_sega16sp_intf =
@@ -2204,13 +2204,13 @@ static const sega16sp_interface wb3bbl_sega16sp_intf =
static MACHINE_CONFIG_DERIVED( wb3bb, system16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wb3bbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wb3bbl_map)
- MDRV_SEGA16SP_ADD("segaspr1", wb3bbl_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", wb3bbl_sega16sp_intf)
- MDRV_VIDEO_START( s16a_bootleg_wb3bl )
- MDRV_VIDEO_UPDATE( s16a_bootleg )
+ MCFG_VIDEO_START( s16a_bootleg_wb3bl )
+ MCFG_VIDEO_UPDATE( s16a_bootleg )
MACHINE_CONFIG_END
@@ -2227,43 +2227,43 @@ static const sega16sp_interface s16bbl_x121_sega16sp_intf =
static MACHINE_CONFIG_START( goldnaxeb1, segas1x_bootleg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(goldnaxeb1_map)
- MDRV_CPU_VBLANK_INT("screen", sys16_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(goldnaxeb1_map)
+ MCFG_CPU_VBLANK_INT("screen", sys16_interrupt)
/* 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(40*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*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(40*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(sys16)
- MDRV_PALETTE_LENGTH(2048*SHADOW_COLORS_MULTIPLIER)
+ MCFG_GFXDECODE(sys16)
+ MCFG_PALETTE_LENGTH(2048*SHADOW_COLORS_MULTIPLIER)
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x121_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x121_sega16sp_intf)
- MDRV_PALETTE_INIT( all_black )
- MDRV_VIDEO_START(system16)
- MDRV_VIDEO_UPDATE(system16)
+ MCFG_PALETTE_INIT( all_black )
+ MCFG_VIDEO_START(system16)
+ MCFG_VIDEO_UPDATE(system16)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( goldnaxeb2, goldnaxeb1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(goldnaxeb2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(goldnaxeb2_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bayrouteb1, goldnaxeb1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bayrouteb1_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bayrouteb1_map)
MACHINE_CONFIG_END
static const sega16sp_interface s16bbl_x107_sega16sp_intf =
@@ -2279,32 +2279,32 @@ static const sega16sp_interface s16bbl_x107_sega16sp_intf =
static MACHINE_CONFIG_DERIVED( bayrouteb2, goldnaxeb1 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bayrouteb2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bayrouteb2_map)
- MDRV_FRAGMENT_ADD(system16_datsu_sound)
+ MCFG_FRAGMENT_ADD(system16_datsu_sound)
- MDRV_DEVICE_REMOVE("segaspr1")
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf)
+ MCFG_DEVICE_REMOVE("segaspr1")
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tturfbl, system16_7759 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tturfbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tturfbl_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(tturfbl_sound_map)
- MDRV_CPU_IO_MAP(tturfbl_sound_io_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(tturfbl_sound_map)
+ MCFG_CPU_IO_MAP(tturfbl_sound_io_map)
- MDRV_DEVICE_REMOVE("7759")
- MDRV_SOUND_ADD("5205", MSM5205, 220000)
- MDRV_SOUND_CONFIG(tturfbl_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_DEVICE_REMOVE("7759")
+ MCFG_SOUND_ADD("5205", MSM5205, 220000)
+ MCFG_SOUND_CONFIG(tturfbl_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf)
MACHINE_CONFIG_END
static const sega16sp_interface s16bbl_x112_sega16sp_intf =
@@ -2320,10 +2320,10 @@ static const sega16sp_interface s16bbl_x112_sega16sp_intf =
static MACHINE_CONFIG_DERIVED( dduxbl, system16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dduxbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dduxbl_map)
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x112_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x112_sega16sp_intf)
MACHINE_CONFIG_END
static const sega16sp_interface s16bbl_x124_sega16sp_intf =
@@ -2339,41 +2339,41 @@ static const sega16sp_interface s16bbl_x124_sega16sp_intf =
static MACHINE_CONFIG_DERIVED( eswatbl, system16_7759 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(eswatbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(eswatbl_map)
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x124_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x124_sega16sp_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fpointbl, system16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fpointbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(fpointbl_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(fpointbl_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(fpointbl_sound_map)
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tetrisbl, system16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(tetrisbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(tetrisbl_map)
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x112_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x112_sega16sp_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( beautyb, system16 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(beautyb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(beautyb_map)
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x112_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x112_sega16sp_intf)
MACHINE_CONFIG_END
@@ -2381,81 +2381,81 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( system18, segas1x_bootleg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_18_map)
- MDRV_CPU_IO_MAP(sound_18_io_map)
+ MCFG_CPU_ADD("soundcpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(sound_18_map)
+ MCFG_CPU_IO_MAP(sound_18_io_map)
/* 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(40*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*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(40*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(sys16)
- MDRV_PALETTE_LENGTH((2048+2048)*SHADOW_COLORS_MULTIPLIER) // 64 extra colours for vdp (but we use 2048 so shadow mask works)
+ MCFG_GFXDECODE(sys16)
+ MCFG_PALETTE_LENGTH((2048+2048)*SHADOW_COLORS_MULTIPLIER) // 64 extra colours for vdp (but we use 2048 so shadow mask works)
- MDRV_VIDEO_START(system18old)
- MDRV_VIDEO_UPDATE(system18old)
+ MCFG_VIDEO_START(system18old)
+ MCFG_VIDEO_UPDATE(system18old)
- MDRV_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf)
+ MCFG_SEGA16SP_ADD("segaspr1", s16bbl_x107_sega16sp_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("3438.0", YM3438, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.40)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.40)
-
- MDRV_SOUND_ADD("3438.1", YM3438, 8000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.40)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.40)
-
- MDRV_SOUND_ADD("5c68", RF5C68, 8000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("3438.0", YM3438, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.40)
+
+ MCFG_SOUND_ADD("3438.1", YM3438, 8000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.40)
+
+ MCFG_SOUND_ADD("5c68", RF5C68, 8000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( astormbl, system18 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astormbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(astormbl_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mwalkbl, system18 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mwalkbl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mwalkbl_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( shdancbl, system18 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shdancbl_map)
-
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(shdancbl_sound_map)
- MDRV_CPU_IO_MAP(shdancbl_sound_io_map)
- MDRV_DEVICE_REMOVE("5c68")
-
- MDRV_SOUND_ADD("5205", MSM5205, 200000)
- MDRV_SOUND_CONFIG(shdancbl_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(shdancbl_map)
+
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(shdancbl_sound_map)
+ MCFG_CPU_IO_MAP(shdancbl_sound_io_map)
+ MCFG_DEVICE_REMOVE("5c68")
+
+ MCFG_SOUND_ADD("5205", MSM5205, 200000)
+ MCFG_SOUND_CONFIG(shdancbl_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index fa36948aec7..7b62d231385 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -214,40 +214,40 @@ GFXDECODE_END
static MACHINE_CONFIG_START( tagteam, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ?? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", tagteam_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ?? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", tagteam_interrupt)
- MDRV_CPU_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */
+ MCFG_CPU_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3072))
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3072))
+ 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)
- MDRV_GFXDECODE(tagteam)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(tagteam)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(tagteam)
- MDRV_VIDEO_START(tagteam)
- MDRV_VIDEO_UPDATE(tagteam)
+ MCFG_PALETTE_INIT(tagteam)
+ MCFG_VIDEO_START(tagteam)
+ MCFG_VIDEO_UPDATE(tagteam)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ 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/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 6a394a13c7f..5e312112b4b 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -239,42 +239,42 @@ static MACHINE_RESET( tail2nos )
static MACHINE_CONFIG_START( tail2nos, tail2nos_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_20MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_port_map)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2608 */
- MDRV_MACHINE_START(tail2nos)
- MDRV_MACHINE_RESET(tail2nos)
+ MCFG_MACHINE_START(tail2nos)
+ MCFG_MACHINE_RESET(tail2nos)
/* 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, 40*8-1, 1*8, 31*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tail2nos)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(tail2nos)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(tail2nos)
- MDRV_VIDEO_UPDATE(tail2nos)
+ MCFG_VIDEO_START(tail2nos)
+ MCFG_VIDEO_UPDATE(tail2nos)
- MDRV_K051316_ADD("k051316", tail2nos_k051316_intf)
+ MCFG_K051316_ADD("k051316", tail2nos_k051316_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2608, XTAL_8MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2608_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", YM2608, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2608_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/taito_b.c b/src/mame/drivers/taito_b.c
index 5a93f122be0..8e21ff1b6a1 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -2217,771 +2217,771 @@ static MACHINE_RESET( taitob )
static MACHINE_CONFIG_START( rastsag2, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(rastsag2_map)
- MDRV_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(rastsag2_map)
+ MCFG_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order0)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order0)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ashura, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(rastsag2_map)
- MDRV_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(rastsag2_map)
+ MCFG_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order0)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order0)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( crimec, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(crimec_map)
- MDRV_CPU_VBLANK_INT("screen", crimec_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(crimec_map)
+ MCFG_CPU_VBLANK_INT("screen", crimec_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order1)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order1)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tetrist, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ???*/
- MDRV_CPU_PROGRAM_MAP(tetrist_map)
- MDRV_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ???*/
+ MCFG_CPU_PROGRAM_MAP(tetrist_map)
+ MCFG_CPU_VBLANK_INT("screen", rastansaga2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order0)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order0)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tetrista, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(tetrista_map)
- MDRV_CPU_VBLANK_INT("screen", masterw_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(tetrista_map)
+ MCFG_CPU_VBLANK_INT("screen", masterw_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(masterw_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(masterw_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order2)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order2)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hitice, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(hitice_map)
- MDRV_CPU_VBLANK_INT("screen", hitice_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(hitice_map)
+ MCFG_CPU_VBLANK_INT("screen", hitice_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(viofight_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(viofight_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(hitice)
- MDRV_VIDEO_RESET(hitice)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(hitice)
+ MCFG_VIDEO_RESET(hitice)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rambo3, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rambo3_map)
- MDRV_CPU_VBLANK_INT("screen", rambo3_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rambo3_map)
+ MCFG_CPU_VBLANK_INT("screen", rambo3_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(rambo3)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(rambo3)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order0)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order0)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rambo3a, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rambo3_map)
- MDRV_CPU_VBLANK_INT("screen", rambo3_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rambo3_map)
+ MCFG_CPU_VBLANK_INT("screen", rambo3_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order2)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order2)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pbobble, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(pbobble_map)
- MDRV_CPU_VBLANK_INT("screen", pbobble_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(pbobble_map)
+ MCFG_CPU_VBLANK_INT("screen", pbobble_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_EEPROM_ADD("eeprom", taitob_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", taitob_eeprom_intf)
- MDRV_TC0640FIO_ADD("tc0640fio", pbobble_io_intf)
+ MCFG_TC0640FIO_ADD("tc0640fio", pbobble_io_intf)
- MDRV_MB87078_ADD("mb87078", taitob_mb87078_intf)
+ MCFG_MB87078_ADD("mb87078", taitob_mb87078_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order1)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order1)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610B, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spacedx, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(spacedx_map)
- MDRV_CPU_VBLANK_INT("screen", pbobble_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(spacedx_map)
+ MCFG_CPU_VBLANK_INT("screen", pbobble_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_EEPROM_ADD("eeprom", taitob_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", taitob_eeprom_intf)
- MDRV_TC0640FIO_ADD("tc0640fio", pbobble_io_intf)
+ MCFG_TC0640FIO_ADD("tc0640fio", pbobble_io_intf)
- MDRV_MB87078_ADD("mb87078", taitob_mb87078_intf)
+ MCFG_MB87078_ADD("mb87078", taitob_mb87078_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order1)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order1)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spacedxo, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(spacedxo_map)
- MDRV_CPU_VBLANK_INT("screen", selfeena_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(spacedxo_map)
+ MCFG_CPU_VBLANK_INT("screen", selfeena_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order2)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order2)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( qzshowby, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/
- MDRV_CPU_PROGRAM_MAP(qzshowby_map)
- MDRV_CPU_VBLANK_INT("screen", pbobble_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/
+ MCFG_CPU_PROGRAM_MAP(qzshowby_map)
+ MCFG_CPU_VBLANK_INT("screen", pbobble_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_EEPROM_ADD("eeprom", taitob_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", taitob_eeprom_intf)
- MDRV_TC0640FIO_ADD("tc0640fio", pbobble_io_intf)
+ MCFG_TC0640FIO_ADD("tc0640fio", pbobble_io_intf)
- MDRV_MB87078_ADD("mb87078", taitob_mb87078_intf)
+ MCFG_MB87078_ADD("mb87078", taitob_mb87078_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order1)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order1)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color1_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610B, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( viofight, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(viofight_map)
- MDRV_CPU_VBLANK_INT("screen", viofight_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(viofight_map)
+ MCFG_CPU_VBLANK_INT("screen", viofight_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz verified */
- MDRV_CPU_PROGRAM_MAP(viofight_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 6000000) /* 6 MHz verified */
+ MCFG_CPU_PROGRAM_MAP(viofight_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order2)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order2)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( masterw, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(masterw_map)
- MDRV_CPU_VBLANK_INT("screen", masterw_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(masterw_map)
+ MCFG_CPU_VBLANK_INT("screen", masterw_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(masterw_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(masterw_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order2)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order2)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( silentd, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(silentd_map)
- MDRV_CPU_VBLANK_INT("screen", silentd_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(silentd_map)
+ MCFG_CPU_VBLANK_INT("screen", silentd_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order2)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order2)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( selfeena, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(selfeena_map)
- MDRV_CPU_VBLANK_INT("screen", selfeena_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(selfeena_map)
+ MCFG_CPU_VBLANK_INT("screen", selfeena_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order2)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order2)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
#if 0
@@ -2997,47 +2997,47 @@ static void ryujin_patch(void)
static MACHINE_CONFIG_START( ryujin, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(selfeena_map)
- MDRV_CPU_VBLANK_INT("screen", selfeena_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(selfeena_map)
+ MCFG_CPU_VBLANK_INT("screen", selfeena_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitob_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitob_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order2)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order2)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color2_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
#if 0
@@ -3051,47 +3051,47 @@ static void sbm_patch(void)
static MACHINE_CONFIG_START( sbm, taitob_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(sbm_map)
- MDRV_CPU_VBLANK_INT("screen", sbm_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(sbm_map)
+ MCFG_CPU_VBLANK_INT("screen", sbm_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitob)
- MDRV_MACHINE_RESET(taitob)
+ MCFG_MACHINE_START(taitob)
+ MCFG_MACHINE_RESET(taitob)
- MDRV_TC0510NIO_ADD("tc0510nio", sbm_io_intf)
+ MCFG_TC0510NIO_ADD("tc0510nio", sbm_io_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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taito_b)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taito_b)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitob_color_order0)
- MDRV_VIDEO_EOF(taitob)
- MDRV_VIDEO_UPDATE(taitob)
+ MCFG_VIDEO_START(taitob_color_order0)
+ MCFG_VIDEO_EOF(taitob)
+ MCFG_VIDEO_UPDATE(taitob)
- MDRV_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
+ MCFG_TC0180VCU_ADD("tc0180vcu", color0_tc0180vcu_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610B, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitob_tc0140syt_intf)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 75eb9823d12..86546abe559 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -3368,616 +3368,616 @@ static MACHINE_START( f2 )
static MACHINE_CONFIG_START( taito_f2, taitof2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
- MDRV_CPU_VBLANK_INT("screen", taitof2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
+ MCFG_CPU_VBLANK_INT("screen", taitof2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 24000000/6) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 24000000/6) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(f2)
+ MCFG_MACHINE_START(f2)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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) /* frames per second, vblank duration */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taitof2)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taitof2)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitof2_default)
- MDRV_VIDEO_EOF(taitof2_no_buffer)
- MDRV_VIDEO_UPDATE(taitof2)
+ MCFG_VIDEO_START(taitof2_default)
+ MCFG_VIDEO_EOF(taitof2_no_buffer)
+ MCFG_VIDEO_UPDATE(taitof2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */
- 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_SOUND_ADD("ymsnd", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */
+ 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)
- MDRV_TC0140SYT_ADD("tc0140syt", taitof2_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitof2_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( taito_f2_tc0220ioc, taito_f2 )
/* basic machine hardware */
- MDRV_TC0220IOC_ADD("tc0220ioc", taitof2_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitof2_io220_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( taito_f2_tc0510nio, taito_f2 )
/* basic machine hardware */
- MDRV_TC0510NIO_ADD("tc0510nio", taitof2_io510_intf)
+ MCFG_TC0510NIO_ADD("tc0510nio", taitof2_io510_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( finalb, taito_f2_tc0220ioc )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(finalb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(finalb_map)
/* video hardware */
- MDRV_GFXDECODE(finalb)
- MDRV_VIDEO_START(taitof2_finalb)
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed)
+ MCFG_GFXDECODE(finalb)
+ MCFG_VIDEO_START(taitof2_finalb)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed)
- MDRV_TC0100SCN_ADD("tc0100scn", finalb_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", finalb_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dondokod, taito_f2_tc0220ioc )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dondokod_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dondokod_map)
/* video hardware */
- MDRV_GFXDECODE(pivot)
- MDRV_VIDEO_START(taitof2_dondokod)
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed)
- MDRV_VIDEO_UPDATE(taitof2_pri_roz)
-
- MDRV_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
- MDRV_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_GFXDECODE(pivot)
+ MCFG_VIDEO_START(taitof2_dondokod)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed)
+ MCFG_VIDEO_UPDATE(taitof2_pri_roz)
+
+ MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
+ MCFG_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( megab, taito_f2_tc0220ioc )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(megab_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(megab_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_megab)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_megab)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( thundfox, taito_f2_tc0220ioc )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(thundfox_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(thundfox_map)
/* video hardware */
- MDRV_GFXDECODE(thundfox)
- MDRV_VIDEO_START(taitof2_thundfox)
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed_thundfox)
- MDRV_VIDEO_UPDATE(taitof2_thundfox)
-
- MDRV_TC0100SCN_ADD("tc0100scn_1", thundfox_tc0100scn_intf_1)
- MDRV_TC0100SCN_ADD("tc0100scn_2", thundfox_tc0100scn_intf_2)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_GFXDECODE(thundfox)
+ MCFG_VIDEO_START(taitof2_thundfox)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed_thundfox)
+ MCFG_VIDEO_UPDATE(taitof2_thundfox)
+
+ MCFG_TC0100SCN_ADD("tc0100scn_1", thundfox_tc0100scn_intf_1)
+ MCFG_TC0100SCN_ADD("tc0100scn_2", thundfox_tc0100scn_intf_2)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cameltry, taito_f2_tc0220ioc )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cameltry_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cameltry_map)
/* video hardware */
- MDRV_GFXDECODE(pivot)
- MDRV_VIDEO_START(taitof2_dondokod)
- MDRV_VIDEO_UPDATE(taitof2_pri_roz)
+ MCFG_GFXDECODE(pivot)
+ MCFG_VIDEO_START(taitof2_dondokod)
+ MCFG_VIDEO_UPDATE(taitof2_pri_roz)
- MDRV_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
- MDRV_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
+ MCFG_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qtorimon, taito_f2_tc0220ioc )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qtorimon_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(qtorimon_map)
/* video hardware */
- MDRV_GFXDECODE(yuyugogo)
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed)
+ MCFG_GFXDECODE(yuyugogo)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed)
- MDRV_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( liquidk, taito_f2_tc0220ioc )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(liquidk_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(liquidk_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_megab)
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_megab)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quizhq, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(quizhq_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(quizhq_map)
/* video hardware */
- MDRV_GFXDECODE(yuyugogo)
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed)
+ MCFG_GFXDECODE(yuyugogo)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed)
- MDRV_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ssi, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ssi_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ssi_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_ssi)
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed_thundfox) // buffer_delayed_thundfox instead of buffer_delayed fixes the butterfly powerup
- MDRV_VIDEO_UPDATE(taitof2_ssi)
+ MCFG_VIDEO_START(taitof2_ssi)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed_thundfox) // buffer_delayed_thundfox instead of buffer_delayed fixes the butterfly powerup
+ MCFG_VIDEO_UPDATE(taitof2_ssi)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gunfront, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(gunfront_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(gunfront_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_gunfront)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_gunfront)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( growl, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(growl_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(growl_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_growl)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_growl)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjnquest, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mjnquest_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mjnquest_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_mjnquest)
+ MCFG_VIDEO_START(taitof2_mjnquest)
- MDRV_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitof2_tc0110pcr_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( footchmp, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(footchmp_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(footchmp_map)
/* video hardware */
- MDRV_GFXDECODE(deadconx)
- MDRV_VIDEO_START(taitof2_footchmp)
- MDRV_VIDEO_EOF(taitof2_full_buffer_delayed)
- MDRV_VIDEO_UPDATE(taitof2_deadconx)
+ MCFG_GFXDECODE(deadconx)
+ MCFG_VIDEO_START(taitof2_footchmp)
+ MCFG_VIDEO_EOF(taitof2_full_buffer_delayed)
+ MCFG_VIDEO_UPDATE(taitof2_deadconx)
- MDRV_TC0480SCP_ADD("tc0480scp", footchmp_tc0480scp_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0480SCP_ADD("tc0480scp", footchmp_tc0480scp_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hthero, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(footchmp_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(footchmp_map)
/* video hardware */
- MDRV_GFXDECODE(deadconx)
- MDRV_VIDEO_START(taitof2_hthero)
- MDRV_VIDEO_EOF(taitof2_full_buffer_delayed)
- MDRV_VIDEO_UPDATE(taitof2_deadconx)
+ MCFG_GFXDECODE(deadconx)
+ MCFG_VIDEO_START(taitof2_hthero)
+ MCFG_VIDEO_EOF(taitof2_full_buffer_delayed)
+ MCFG_VIDEO_UPDATE(taitof2_deadconx)
- MDRV_TC0360PRI_ADD("tc0360pri")
- MDRV_TC0480SCP_ADD("tc0480scp", hthero_tc0480scp_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0480SCP_ADD("tc0480scp", hthero_tc0480scp_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( koshien, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(koshien_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(koshien_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_koshien)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_koshien)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", koshien_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", koshien_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yuyugogo, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yuyugogo_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(yuyugogo_map)
/* video hardware */
- MDRV_GFXDECODE(yuyugogo)
- MDRV_VIDEO_START(taitof2_yuyugogo)
- MDRV_VIDEO_UPDATE(taitof2_yesnoj)
+ MCFG_GFXDECODE(yuyugogo)
+ MCFG_VIDEO_START(taitof2_yuyugogo)
+ MCFG_VIDEO_UPDATE(taitof2_yesnoj)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ninjak, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ninjak_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ninjak_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_ninjak)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_ninjak)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", finalb_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", finalb_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( solfigtr, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(solfigtr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(solfigtr_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_solfigtr)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_solfigtr)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", solfigtr_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", solfigtr_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qzquest, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qzquest_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(qzquest_map)
/* video hardware */
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed)
- MDRV_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitof2_tc0100scn_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pulirula, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(pulirula_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(pulirula_map)
/* video hardware */
- MDRV_GFXDECODE(pivot)
- MDRV_VIDEO_START(taitof2_pulirula)
- MDRV_VIDEO_UPDATE(taitof2_pri_roz)
+ MCFG_GFXDECODE(pivot)
+ MCFG_VIDEO_START(taitof2_pulirula)
+ MCFG_VIDEO_UPDATE(taitof2_pri_roz)
- MDRV_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
- MDRV_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
+ MCFG_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( metalb, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(metalb_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(metalb_map)
/* video hardware */
- MDRV_GFXDECODE(deadconx)
- MDRV_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(taitof2_metalb)
- MDRV_VIDEO_UPDATE(taitof2_metalb)
+ MCFG_GFXDECODE(deadconx)
+ MCFG_PALETTE_LENGTH(8192)
+ MCFG_VIDEO_START(taitof2_metalb)
+ MCFG_VIDEO_UPDATE(taitof2_metalb)
- MDRV_TC0480SCP_ADD("tc0480scp", metalb_tc0480scp_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0480SCP_ADD("tc0480scp", metalb_tc0480scp_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qzchikyu, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qzchikyu_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(qzchikyu_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_qzchikyu)
- MDRV_VIDEO_EOF(taitof2_partial_buffer_delayed_qzchikyu)
+ MCFG_VIDEO_START(taitof2_qzchikyu)
+ MCFG_VIDEO_EOF(taitof2_partial_buffer_delayed_qzchikyu)
- MDRV_TC0100SCN_ADD("tc0100scn", qzchikyu_tc0100scn_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", qzchikyu_tc0100scn_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( yesnoj, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yesnoj_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(yesnoj_map)
/* video hardware */
- MDRV_GFXDECODE(yuyugogo)
- MDRV_VIDEO_START(taitof2_yesnoj)
- MDRV_VIDEO_UPDATE(taitof2_yesnoj)
+ MCFG_GFXDECODE(yuyugogo)
+ MCFG_VIDEO_START(taitof2_yesnoj)
+ MCFG_VIDEO_UPDATE(taitof2_yesnoj)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( deadconx, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(deadconx_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(deadconx_map)
/* video hardware */
- MDRV_GFXDECODE(deadconx)
- MDRV_VIDEO_START(taitof2_deadconx)
- MDRV_VIDEO_UPDATE(taitof2_deadconx)
+ MCFG_GFXDECODE(deadconx)
+ MCFG_VIDEO_START(taitof2_deadconx)
+ MCFG_VIDEO_UPDATE(taitof2_deadconx)
- MDRV_TC0480SCP_ADD("tc0480scp", deadconx_tc0480scp_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0480SCP_ADD("tc0480scp", deadconx_tc0480scp_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( deadconxj, taito_f2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(deadconx_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(deadconx_map)
/* video hardware */
- MDRV_GFXDECODE(deadconx)
- MDRV_VIDEO_START(taitof2_deadconxj)
- MDRV_VIDEO_UPDATE(taitof2_deadconx)
+ MCFG_GFXDECODE(deadconx)
+ MCFG_VIDEO_START(taitof2_deadconxj)
+ MCFG_VIDEO_UPDATE(taitof2_deadconx)
- MDRV_TC0480SCP_ADD("tc0480scp", deadconxj_tc0480scp_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0480SCP_ADD("tc0480scp", deadconxj_tc0480scp_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dinorex, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(dinorex_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(dinorex_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_dinorex)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_dinorex)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qjinsei, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qjinsei_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(qjinsei_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_quiz)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_quiz)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qcrayon, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qcrayon_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(qcrayon_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_quiz)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_quiz)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qcrayon2, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(qcrayon2_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(qcrayon2_map)
/* video hardware */
- MDRV_VIDEO_START(taitof2_quiz)
- MDRV_VIDEO_UPDATE(taitof2_pri)
+ MCFG_VIDEO_START(taitof2_quiz)
+ MCFG_VIDEO_UPDATE(taitof2_pri)
- MDRV_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", liquidk_tc0100scn_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( driftout, taito_f2_tc0510nio )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(driftout_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(driftout_map)
/* video hardware */
- MDRV_GFXDECODE(pivot)
- MDRV_VIDEO_START(taitof2_driftout)
- MDRV_VIDEO_UPDATE(taitof2_pri_roz)
+ MCFG_GFXDECODE(pivot)
+ MCFG_VIDEO_START(taitof2_driftout)
+ MCFG_VIDEO_UPDATE(taitof2_pri_roz)
- MDRV_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
- MDRV_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
+ MCFG_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cameltrya, taitof2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cameltry_map)
- MDRV_CPU_VBLANK_INT("screen", taitof2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cameltry_map)
+ MCFG_CPU_VBLANK_INT("screen", taitof2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,24000000/4) /* verifed on pcb */
- MDRV_CPU_PROGRAM_MAP(cameltrya_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,24000000/4) /* verifed on pcb */
+ MCFG_CPU_PROGRAM_MAP(cameltrya_sound_map)
- MDRV_MACHINE_START(common)
+ MCFG_MACHINE_START(common)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitof2_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitof2_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pivot)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(pivot)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitof2_dondokod)
- MDRV_VIDEO_EOF(taitof2_no_buffer)
- MDRV_VIDEO_UPDATE(taitof2_pri_roz)
+ MCFG_VIDEO_START(taitof2_dondokod)
+ MCFG_VIDEO_EOF(taitof2_no_buffer)
+ MCFG_VIDEO_UPDATE(taitof2_pri_roz)
- MDRV_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
- MDRV_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
+ MCFG_TC0430GRW_ADD("tc0280grd", taitof2_tc0280grd_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 24000000/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 24000000/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MDRV_OKIM6295_ADD("oki", 4224000/4, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_OKIM6295_ADD("oki", 4224000/4, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_TC0140SYT_ADD("tc0140syt", taitof2_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitof2_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( driveout, taitof2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(driveout_map)
- MDRV_CPU_VBLANK_INT("screen", taitof2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(driveout_map)
+ MCFG_CPU_VBLANK_INT("screen", taitof2_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,24000000/6) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(driveout_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,24000000/6) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(driveout_sound_map)
- MDRV_MACHINE_START(common)
+ MCFG_MACHINE_START(common)
- MDRV_TC0510NIO_ADD("tc0510nio", taitof2_io510_intf)
+ MCFG_TC0510NIO_ADD("tc0510nio", taitof2_io510_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(pivot)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(pivot)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitof2_driftout)
- MDRV_VIDEO_EOF(taitof2_no_buffer)
- MDRV_VIDEO_UPDATE(taitof2_pri_roz)
+ MCFG_VIDEO_START(taitof2_driftout)
+ MCFG_VIDEO_EOF(taitof2_no_buffer)
+ MCFG_VIDEO_UPDATE(taitof2_pri_roz)
- MDRV_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
- MDRV_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf)
- MDRV_TC0360PRI_ADD("tc0360pri")
+ MCFG_TC0100SCN_ADD("tc0100scn", dondokod_tc0100scn_intf)
+ MCFG_TC0430GRW_ADD("tc0430grw", taitof2_tc0430grw_intf)
+ MCFG_TC0360PRI_ADD("tc0360pri")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* does it ? */
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* does it ? */
- MDRV_OKIM6295_ADD("oki", 1056000, 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("oki", 1056000, 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_TC0140SYT_ADD("tc0140syt", taitof2_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitof2_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index a3af3451477..ff8b058e845 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -392,32 +392,32 @@ static MACHINE_START(f3)
static MACHINE_CONFIG_START( f3, taito_f3_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(f3_map)
- MDRV_CPU_VBLANK_INT("screen", f3_interrupt2)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(f3_map)
+ MCFG_CPU_VBLANK_INT("screen", f3_interrupt2)
- MDRV_MACHINE_START(f3)
+ MCFG_MACHINE_START(f3)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58.97)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(624) /* 58.97 Hz, 624us vblank time */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8+48*2, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 24, 24+232-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58.97)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(624) /* 58.97 Hz, 624us vblank time */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8+48*2, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 24, 24+232-1)
- MDRV_GFXDECODE(taito_f3)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_GFXDECODE(taito_f3)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(f3)
- MDRV_VIDEO_EOF(f3)
- MDRV_VIDEO_UPDATE(f3)
+ MCFG_VIDEO_START(f3)
+ MCFG_VIDEO_EOF(f3)
+ MCFG_VIDEO_UPDATE(f3)
/* sound hardware */
- MDRV_FRAGMENT_ADD(taito_f3_sound)
- MDRV_SOUND_RESET(f3)
+ MCFG_FRAGMENT_ADD(taito_f3_sound)
+ MCFG_SOUND_RESET(f3)
MACHINE_CONFIG_END
/* These games reprogram the video output registers to display different scanlines,
@@ -426,33 +426,33 @@ MACHINE_CONFIG_END
monitor recalibration.)
*/
static MACHINE_CONFIG_DERIVED( f3_224a, f3 )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 31, 31+224-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 31, 31+224-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( f3_224b, f3 )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 32, 32+224-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 32, 32+224-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( f3_224c, f3 )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 24, 24+224-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 24, 24+224-1)
MACHINE_CONFIG_END
/* recalh and gseeker need a default EEPROM to work */
static MACHINE_CONFIG_DERIVED( f3_eeprom, f3 )
- MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DATA(recalh_eeprom, 128)
+ MCFG_DEVICE_REMOVE("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DATA(recalh_eeprom, 128)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( f3_224b_eeprom, f3 )
- MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_EEPROM_DATA(recalh_eeprom, 128)
+ MCFG_DEVICE_REMOVE("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_DATA(recalh_eeprom, 128)
MACHINE_CONFIG_END
static const gfx_layout bubsympb_sprite_layout =
@@ -487,34 +487,34 @@ GFXDECODE_END
static MACHINE_CONFIG_START( bubsympb, taito_f3_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(f3_map)
- MDRV_CPU_VBLANK_INT("screen", f3_interrupt2)
+ MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(f3_map)
+ MCFG_CPU_VBLANK_INT("screen", f3_interrupt2)
- MDRV_MACHINE_START(f3)
+ MCFG_MACHINE_START(f3)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58.97)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(624) /* 58.97 Hz, 624us vblank time */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(40*8+48*2, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 31, 31+224-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58.97)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(624) /* 58.97 Hz, 624us vblank time */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(40*8+48*2, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 31, 31+224-1)
- MDRV_GFXDECODE(bubsympb)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(bubsympb)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(f3)
- MDRV_VIDEO_EOF(f3)
- MDRV_VIDEO_UPDATE(f3)
+ MCFG_VIDEO_START(f3)
+ MCFG_VIDEO_EOF(f3)
+ MCFG_VIDEO_UPDATE(f3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1000000 , OKIM6295_PIN7_HIGH) // not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000 , OKIM6295_PIN7_HIGH) // not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index 7e401f957a2..bf167bbb4ef 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -566,135 +566,135 @@ static const tc0140syt_interface taitoh_tc0140syt_intf =
static MACHINE_CONFIG_START( syvalion, taitoh_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(syvalion_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(syvalion_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(taitoh)
- MDRV_MACHINE_RESET(taitoh)
+ MCFG_MACHINE_START(taitoh)
+ MCFG_MACHINE_RESET(taitoh)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoh_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoh_io_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(64*16, 64*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 28*16-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(64*16, 64*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 28*16-1)
- MDRV_GFXDECODE(syvalion)
- MDRV_PALETTE_LENGTH(33*16)
+ MCFG_GFXDECODE(syvalion)
+ MCFG_PALETTE_LENGTH(33*16)
- MDRV_VIDEO_UPDATE(syvalion)
+ MCFG_VIDEO_UPDATE(syvalion)
- MDRV_TC0080VCO_ADD("tc0080vco", syvalion_tc0080vco_intf)
+ MCFG_TC0080VCO_ADD("tc0080vco", syvalion_tc0080vco_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitoh_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoh_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( recordbr, taitoh_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(recordbr_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(recordbr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(taitoh)
- MDRV_MACHINE_RESET(taitoh)
+ MCFG_MACHINE_START(taitoh)
+ MCFG_MACHINE_RESET(taitoh)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoh_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoh_io_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(64*16, 64*16)
- MDRV_SCREEN_VISIBLE_AREA(1*16, 21*16-1, 2*16, 17*16-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(64*16, 64*16)
+ MCFG_SCREEN_VISIBLE_AREA(1*16, 21*16-1, 2*16, 17*16-1)
- MDRV_GFXDECODE(recordbr)
- MDRV_PALETTE_LENGTH(32*16)
+ MCFG_GFXDECODE(recordbr)
+ MCFG_PALETTE_LENGTH(32*16)
- MDRV_VIDEO_UPDATE(recordbr)
+ MCFG_VIDEO_UPDATE(recordbr)
- MDRV_TC0080VCO_ADD("tc0080vco", recordbr_tc0080vco_intf)
+ MCFG_TC0080VCO_ADD("tc0080vco", recordbr_tc0080vco_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitoh_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoh_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dleague, taitoh_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(dleague_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(dleague_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(taitoh)
- MDRV_MACHINE_RESET(taitoh)
+ MCFG_MACHINE_START(taitoh)
+ MCFG_MACHINE_RESET(taitoh)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoh_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoh_io_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(64*16, 64*16)
- MDRV_SCREEN_VISIBLE_AREA(1*16, 21*16-1, 2*16, 17*16-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(64*16, 64*16)
+ MCFG_SCREEN_VISIBLE_AREA(1*16, 21*16-1, 2*16, 17*16-1)
- MDRV_GFXDECODE(dleague)
- MDRV_PALETTE_LENGTH(33*16)
+ MCFG_GFXDECODE(dleague)
+ MCFG_PALETTE_LENGTH(33*16)
- MDRV_VIDEO_UPDATE(dleague)
+ MCFG_VIDEO_UPDATE(dleague)
- MDRV_TC0080VCO_ADD("tc0080vco", recordbr_tc0080vco_intf)
+ MCFG_TC0080VCO_ADD("tc0080vco", recordbr_tc0080vco_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_TC0140SYT_ADD("tc0140syt", taitoh_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoh_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index c655a987140..dcb96bd0816 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -2023,76 +2023,76 @@ static const tc0140syt_interface taitol_tc0140syt_intf =
static MACHINE_CONFIG_START( fhawk, taitol_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
- MDRV_CPU_PROGRAM_MAP(fhawk_map)
- MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_CPU_PROGRAM_MAP(fhawk_map)
+ MCFG_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(fhawk_3_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(fhawk_3_map)
- MDRV_CPU_ADD("slave", Z80, XTAL_12MHz/3) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(fhawk_2_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,3) /* fixes slow down problems */
+ MCFG_CPU_ADD("slave", Z80, XTAL_12MHz/3) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(fhawk_2_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,3) /* fixes slow down problems */
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(taito_l)
- MDRV_MACHINE_RESET(fhawk)
+ MCFG_MACHINE_START(taito_l)
+ MCFG_MACHINE_RESET(fhawk)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(2)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(2)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(taitol)
- MDRV_VIDEO_EOF(taitol)
- MDRV_VIDEO_UPDATE(taitol)
+ MCFG_VIDEO_START(taitol)
+ MCFG_VIDEO_EOF(taitol)
+ MCFG_VIDEO_UPDATE(taitol)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_interface_triple)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_interface_triple)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_TC0140SYT_ADD("tc0140syt", taitol_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitol_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( champwr, fhawk )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(champwr_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(champwr_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(champwr_3_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(champwr_3_map)
- MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(champwr_2_map)
+ MCFG_CPU_MODIFY("slave")
+ MCFG_CPU_PROGRAM_MAP(champwr_2_map)
- MDRV_MACHINE_RESET(champwr)
+ MCFG_MACHINE_RESET(champwr)
/* sound hardware */
- MDRV_SOUND_MODIFY("ymsnd")
- MDRV_SOUND_CONFIG(ym2203_interface_champwr)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
-
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_SOUND_CONFIG(ym2203_interface_champwr)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
+
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -2100,67 +2100,67 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( raimais, fhawk )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(raimais_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(raimais_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(raimais_3_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(raimais_3_map)
- MDRV_CPU_MODIFY("slave")
- MDRV_CPU_PROGRAM_MAP(raimais_2_map)
+ MCFG_CPU_MODIFY("slave")
+ MCFG_CPU_PROGRAM_MAP(raimais_2_map)
- MDRV_MACHINE_RESET(raimais)
+ MCFG_MACHINE_RESET(raimais)
/* sound hardware */
- MDRV_SOUND_REPLACE("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_REPLACE("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kurikint, taitol_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
- MDRV_CPU_PROGRAM_MAP(kurikint_map)
- MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_CPU_PROGRAM_MAP(kurikint_map)
+ MCFG_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(kurikint_2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(kurikint_2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(taito_l)
- MDRV_MACHINE_RESET(kurikint)
+ MCFG_MACHINE_START(taito_l)
+ MCFG_MACHINE_RESET(kurikint)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(2)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(2)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(taitol)
- MDRV_VIDEO_EOF(taitol)
- MDRV_VIDEO_UPDATE(taitol)
+ MCFG_VIDEO_START(taitol)
+ MCFG_VIDEO_EOF(taitol)
+ MCFG_VIDEO_UPDATE(taitol)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_TC0140SYT_ADD("tc0140syt", taitol_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitol_tc0140syt_intf)
MACHINE_CONFIG_END
@@ -2169,152 +2169,152 @@ static MACHINE_CONFIG_DERIVED( kurikinta, kurikint )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(1)
+ MCFG_GFXDECODE(1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( plotting, taitol_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
- MDRV_CPU_PROGRAM_MAP(plotting_map)
- MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_CPU_PROGRAM_MAP(plotting_map)
+ MCFG_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
- MDRV_MACHINE_START(taito_l)
- MDRV_MACHINE_RESET(plotting)
+ MCFG_MACHINE_START(taito_l)
+ MCFG_MACHINE_RESET(plotting)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(1)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(1)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(taitol)
- MDRV_VIDEO_EOF(taitol)
- MDRV_VIDEO_UPDATE(taitol)
+ MCFG_VIDEO_START(taitol)
+ MCFG_VIDEO_EOF(taitol)
+ MCFG_VIDEO_UPDATE(taitol)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_13_33056MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_interface_single)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_13_33056MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_interface_single)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_TC0140SYT_ADD("tc0140syt", taitol_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitol_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( puzznic, plotting )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(puzznic_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(puzznic_map)
- MDRV_MACHINE_RESET(puzznic)
+ MCFG_MACHINE_RESET(puzznic)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( puzznici, plotting )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(puzznici_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(puzznici_map)
- MDRV_MACHINE_RESET(puzznic)
+ MCFG_MACHINE_RESET(puzznic)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( horshoes, plotting )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(horshoes_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(horshoes_map)
- MDRV_MACHINE_RESET(horshoes)
+ MCFG_MACHINE_RESET(horshoes)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( palamed, plotting )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(palamed_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(palamed_map)
- MDRV_MACHINE_RESET(palamed)
+ MCFG_MACHINE_RESET(palamed)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cachat, plotting )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cachat_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cachat_map)
- MDRV_MACHINE_RESET(cachat)
+ MCFG_MACHINE_RESET(cachat)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( evilston, taitol_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* not verified */
- MDRV_CPU_PROGRAM_MAP(evilston_map)
- MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* not verified */
+ MCFG_CPU_PROGRAM_MAP(evilston_map)
+ MCFG_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* not verified */
- MDRV_CPU_PROGRAM_MAP(evilston_2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/3) /* not verified */
+ MCFG_CPU_PROGRAM_MAP(evilston_2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(taito_l)
- MDRV_MACHINE_RESET(evilston)
+ MCFG_MACHINE_START(taito_l)
+ MCFG_MACHINE_RESET(evilston)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(2)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(2)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(taitol)
- MDRV_VIDEO_EOF(taitol)
- MDRV_VIDEO_UPDATE(taitol)
+ MCFG_VIDEO_START(taitol)
+ MCFG_VIDEO_EOF(taitol)
+ MCFG_VIDEO_UPDATE(taitol)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* not verified */
- MDRV_SOUND_ROUTE(0, "mono", 0.00)
- MDRV_SOUND_ROUTE(1, "mono", 0.00)
- MDRV_SOUND_ROUTE(2, "mono", 0.00)
- MDRV_SOUND_ROUTE(3, "mono", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* not verified */
+ MCFG_SOUND_ROUTE(0, "mono", 0.00)
+ MCFG_SOUND_ROUTE(1, "mono", 0.00)
+ MCFG_SOUND_ROUTE(2, "mono", 0.00)
+ MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MDRV_TC0140SYT_ADD("tc0140syt", taitol_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitol_tc0140syt_intf)
MACHINE_CONFIG_END
#ifdef UNUSED_CODE
static MACHINE_CONFIG_DERIVED( lagirl, plotting )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(XTAL_27_2109MHz/4)
- MDRV_CPU_PROGRAM_MAP(cachat_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(XTAL_27_2109MHz/4)
+ MCFG_CPU_PROGRAM_MAP(cachat_map)
/* sound hardware */
- MDRV_SOUND_REPLACE("ymsnd", YM2203, XTAL_27_2109MHz/8)
+ MCFG_SOUND_REPLACE("ymsnd", YM2203, XTAL_27_2109MHz/8)
- MDRV_MACHINE_RESET(cachat)
+ MCFG_MACHINE_RESET(cachat)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c
index 6234c6f5bcd..f99b5caaab4 100644
--- a/src/mame/drivers/taito_o.c
+++ b/src/mame/drivers/taito_o.c
@@ -248,34 +248,34 @@ static MACHINE_START( taitoo )
static MACHINE_CONFIG_START( parentj, taitoo_state )
- MDRV_CPU_ADD("maincpu", M68000,12000000 ) /*?? MHz */
- MDRV_CPU_PROGRAM_MAP(parentj_map)
- MDRV_CPU_VBLANK_INT_HACK(parentj_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000,12000000 ) /*?? MHz */
+ MCFG_CPU_PROGRAM_MAP(parentj_map)
+ MCFG_CPU_VBLANK_INT_HACK(parentj_interrupt,2)
- MDRV_MACHINE_START(taitoo)
+ MCFG_MACHINE_START(taitoo)
- 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*16, 64*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 31*16-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(64*16, 64*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 31*16-1)
- MDRV_GFXDECODE(parentj)
- MDRV_PALETTE_LENGTH(33*16)
+ MCFG_GFXDECODE(parentj)
+ MCFG_PALETTE_LENGTH(33*16)
- MDRV_VIDEO_UPDATE(parentj)
+ MCFG_VIDEO_UPDATE(parentj)
- MDRV_TC0080VCO_ADD("tc0080vco", parentj_intf)
+ MCFG_TC0080VCO_ADD("tc0080vco", parentj_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 2000000) /*?? MHz */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 2000000) /*?? MHz */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( parentj )
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index c7535ebbf14..3e9b4297348 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -912,164 +912,164 @@ static const tc0140syt_interface taitox_tc0140syt_intf =
static MACHINE_CONFIG_START( superman, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(superman_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(superman_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(taitox)
- MDRV_MACHINE_RESET(cchip1)
+ MCFG_MACHINE_START(taitox)
+ MCFG_MACHINE_RESET(cchip1)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.43)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(52*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.43)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(52*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(superman)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(superman)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers)
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
- 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_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) /* verified on pcb */
+ 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)
- MDRV_TC0140SYT_ADD("tc0140syt", taitox_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitox_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( daisenpu, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(daisenpu_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(daisenpu_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(daisenpu_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(daisenpu_sound_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(taitox)
+ MCFG_MACHINE_START(taitox)
/* 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(52*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*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(52*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(superman)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(superman)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers)
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_TC0140SYT_ADD("tc0140syt", taitox_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitox_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( gigandes, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(gigandes_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
+ MCFG_CPU_PROGRAM_MAP(gigandes_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(taitox)
+ MCFG_MACHINE_START(taitox)
/* 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(52*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*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(52*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(superman)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(superman)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers)
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_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_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)
- MDRV_TC0140SYT_ADD("tc0140syt", taitox_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitox_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ballbros, seta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(ballbros_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
+ MCFG_CPU_PROGRAM_MAP(ballbros_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MDRV_MACHINE_START(taitox)
+ MCFG_MACHINE_START(taitox)
/* 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(52*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*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(52*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(ballbros)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(ballbros)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(seta_no_layers)
- MDRV_VIDEO_UPDATE(seta_no_layers)
+ MCFG_VIDEO_START(seta_no_layers)
+ MCFG_VIDEO_UPDATE(seta_no_layers)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_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_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)
- MDRV_TC0140SYT_ADD("tc0140syt", taitox_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", taitox_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index d07d6881437..27d736d48d3 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -3015,632 +3015,632 @@ static MACHINE_RESET( taitoz )
static MACHINE_CONFIG_START( contcirc, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(contcirc_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(contcirc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(contcirc_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(contcirc_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(taitoz)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(taitoz)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 31*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 31*8-1)
- MDRV_GFXDECODE(taitoz)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taitoz)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(contcirc)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(contcirc)
- MDRV_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_ADD("front", 0.0, 0.0, 0.7)
- MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
- MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
- MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 2.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
-
-// MDRV_SOUND_ADD("subwoofer", SUBWOOFER, 0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ MCFG_SPEAKER_ADD("front", 0.0, 0.0, 0.7)
+ MCFG_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
+ MCFG_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "subwoofer", 0.20)
+ MCFG_SOUND_ROUTE(1, "2610.1.l", 2.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 2.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 2.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 2.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
+
+// MCFG_SOUND_ADD("subwoofer", SUBWOOFER, 0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( chasehq, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(chasehq_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(chasehq_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(chq_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(chq_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(taitoz)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(taitoz)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(chasehq)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(chasehq)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(chasehq)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(chasehq)
- MDRV_TC0100SCN_ADD("tc0100scn", chasehq_tc0100scn_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", chasehq_tc0100scn_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_ADD("front", 0.0, 0.0, 0.7)
- MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
- MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
- MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ MCFG_SPEAKER_ADD("front", 0.0, 0.0, 0.7)
+ MCFG_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
+ MCFG_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "subwoofer", 0.20)
+ MCFG_SOUND_ROUTE(1, "2610.1.l", 1.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 1.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( enforce, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(enforce_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(enforce_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(enforce_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(enforce_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(taitoz)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(taitoz)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 31*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 31*8-1)
- MDRV_GFXDECODE(taitoz)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taitoz)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(contcirc)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(contcirc)
- MDRV_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
/* sound hardware */
- 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, "2610.1.l", 20.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 20.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 20.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 20.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
-// MDRV_SOUND_ADD("subwoofer", SUBWOOFER, 0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ 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, "2610.1.l", 20.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 20.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 20.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 20.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+
+// MCFG_SOUND_ADD("subwoofer", SUBWOOFER, 0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bshark, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(bshark_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(bshark_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(bshark_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(bshark_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(bshark)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(bshark)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(taitoz)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taitoz)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(bshark)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(bshark)
- MDRV_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2)
- MDRV_SOUND_CONFIG(ym2610_interfaceb)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "2610.1.l", 28.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 28.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 28.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 28.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_SOUND_CONFIG(ym2610_interfaceb)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "2610.1.l", 28.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 28.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 28.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 28.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sci, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sci_map)
- MDRV_CPU_VBLANK_INT("screen", sci_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sci_map)
+ MCFG_CPU_VBLANK_INT("screen", sci_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sci_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sci_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(taitoz)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(taitoz)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_QUANTUM_TIME(HZ(3000))
+ MCFG_QUANTUM_TIME(HZ(3000))
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(taitoz)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taitoz)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(sci)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(sci)
- MDRV_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
/* sound hardware */
- 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, "2610.1.l", 2.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 2.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ 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, "2610.1.l", 2.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 2.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 2.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 2.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( nightstr, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(nightstr_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(nightstr_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(nightstr_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(nightstr_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(taitoz)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(taitoz)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(chasehq)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(chasehq)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(chasehq)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(chasehq)
- MDRV_TC0100SCN_ADD("tc0100scn", chasehq_tc0100scn_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", chasehq_tc0100scn_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_ADD("front", 0.0, 0.0, 0.7)
- MDRV_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
- MDRV_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "subwoofer", 0.20)
- MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 2.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ MCFG_SPEAKER_ADD("front", 0.0, 0.0, 0.7)
+ MCFG_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
+ MCFG_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "subwoofer", 0.20)
+ MCFG_SOUND_ROUTE(1, "2610.1.l", 2.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 2.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 2.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 2.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rear", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "front", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( aquajack, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(aquajack_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(aquajack_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(aquajack_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(aquajack_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(taitoz)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(taitoz)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_QUANTUM_TIME(HZ(30000))
+ MCFG_QUANTUM_TIME(HZ(30000))
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(taitoz)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taitoz)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(aquajack)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(aquajack)
- MDRV_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", taitoz_tc0100scn_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
/* sound hardware */
- 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, "2610.1.l", 2.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 2.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ 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, "2610.1.l", 2.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 2.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 2.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 2.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spacegun, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(spacegun_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(spacegun_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(spacegun_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(spacegun_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(bshark)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(bshark)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_EEPROM_ADD("eeprom", spacegun_eeprom_intf)
- MDRV_EEPROM_DATA(spacegun_default_eeprom, 128)
+ MCFG_EEPROM_ADD("eeprom", spacegun_eeprom_intf)
+ MCFG_EEPROM_DATA(spacegun_default_eeprom, 128)
- MDRV_TC0220IOC_ADD("tc0220ioc", taitoz_io220_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", taitoz_io220_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(taitoz)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(taitoz)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_UPDATE(spacegun)
+ MCFG_VIDEO_UPDATE(spacegun)
- MDRV_TC0100SCN_ADD("tc0100scn", spacegun_tc0100scn_intf)
- MDRV_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", spacegun_tc0100scn_intf)
+ MCFG_TC0110PCR_ADD("tc0110pcr", taitoz_tc0110pcr_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2)
- MDRV_SOUND_CONFIG(ym2610_interfaceb)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "2610.1.l", 8.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 8.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_SOUND_CONFIG(ym2610_interfaceb)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "2610.1.l", 8.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 8.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 8.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 8.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( dblaxle, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(dblaxle_map)
- MDRV_CPU_VBLANK_INT("screen", dblaxle_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(dblaxle_map)
+ MCFG_CPU_VBLANK_INT("screen", dblaxle_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(dblaxle_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", dblaxle_cpub_interrupt)
+ MCFG_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(dblaxle_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", dblaxle_cpub_interrupt)
- MDRV_MACHINE_START(taitoz)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(taitoz)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_TC0510NIO_ADD("tc0510nio", taitoz_io510_intf)
+ MCFG_TC0510NIO_ADD("tc0510nio", taitoz_io510_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(dblaxle)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(dblaxle)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(dblaxle)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(dblaxle)
- MDRV_TC0480SCP_ADD("tc0480scp", taitoz_tc0480scp_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0480SCP_ADD("tc0480scp", taitoz_tc0480scp_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
/* sound hardware */
- 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, "2610.1.l", 8.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 8.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ 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, "2610.1.l", 8.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 8.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 8.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 8.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( racingb, taitoz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(racingb_map)
- MDRV_CPU_VBLANK_INT("screen", dblaxle_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(racingb_map)
+ MCFG_CPU_VBLANK_INT("screen", dblaxle_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(racingb_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", dblaxle_cpub_interrupt)
+ MCFG_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(racingb_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", dblaxle_cpub_interrupt)
- MDRV_MACHINE_START(taitoz)
- MDRV_MACHINE_RESET(taitoz)
+ MCFG_MACHINE_START(taitoz)
+ MCFG_MACHINE_RESET(taitoz)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_TC0510NIO_ADD("tc0510nio", taitoz_io510_intf)
+ MCFG_TC0510NIO_ADD("tc0510nio", taitoz_io510_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(dblaxle)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(dblaxle)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(taitoz)
- MDRV_VIDEO_UPDATE(dblaxle)
+ MCFG_VIDEO_START(taitoz)
+ MCFG_VIDEO_UPDATE(dblaxle)
- MDRV_TC0480SCP_ADD("tc0480scp", taitoz_tc0480scp_intf)
- MDRV_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
+ MCFG_TC0480SCP_ADD("tc0480scp", taitoz_tc0480scp_intf)
+ MCFG_TC0150ROD_ADD("tc0150rod", taitoz_tc0150rod_intf)
/* sound hardware */
- 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, "2610.1.l", 8.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 8.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0)
-
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
+ 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, "2610.1.l", 8.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 8.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 8.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 8.0)
+
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", taitoz_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 569afb5e7f1..1ed8d6f97a1 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -651,50 +651,50 @@ static MACHINE_RESET( taitoair )
static MACHINE_CONFIG_START( airsys, taitoair_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(airsys_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000 / 2) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(airsys_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000 / 2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz ??? *///
- MDRV_CPU_PROGRAM_MAP(DSP_map_program)
- MDRV_CPU_DATA_MAP(DSP_map_data)
- MDRV_CPU_IO_MAP(DSP_map_io)
+ MCFG_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz ??? *///
+ MCFG_CPU_PROGRAM_MAP(DSP_map_program)
+ MCFG_CPU_DATA_MAP(DSP_map_data)
+ MCFG_CPU_IO_MAP(DSP_map_io)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(taitoair)
- MDRV_MACHINE_RESET(taitoair)
+ MCFG_MACHINE_START(taitoair)
+ MCFG_MACHINE_RESET(taitoair)
- MDRV_TC0220IOC_ADD("tc0220ioc", airsys_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", airsys_io_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(64*16, 64*16)
- MDRV_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 28*16-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(64*16, 64*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 3*16, 28*16-1)
- MDRV_GFXDECODE(airsys)
- MDRV_PALETTE_LENGTH(512*16)
+ MCFG_GFXDECODE(airsys)
+ MCFG_PALETTE_LENGTH(512*16)
- MDRV_VIDEO_UPDATE(taitoair)
+ MCFG_VIDEO_UPDATE(taitoair)
- MDRV_TC0080VCO_ADD("tc0080vco", airsys_tc0080vco_intf)
+ MCFG_TC0080VCO_ADD("tc0080vco", airsys_tc0080vco_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(airsys_ym2610_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ROUTE(2, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(airsys_ym2610_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ROUTE(2, "mono", 0.60)
- MDRV_TC0140SYT_ADD("tc0140syt", airsys_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", airsys_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index 5f4ee765368..7242448c1a4 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -972,46 +972,46 @@ static const psx_spu_interface psxspu_interface =
static MACHINE_CONFIG_START( coh3002t, taitogn_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_100MHz )
- MDRV_CPU_PROGRAM_MAP( zn_map)
- MDRV_CPU_VBLANK_INT("screen", psx_vblank)
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_100MHz )
+ MCFG_CPU_PROGRAM_MAP( zn_map)
+ MCFG_CPU_VBLANK_INT("screen", psx_vblank)
/* 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( 1024, 1024 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ 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( 1024, 1024 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type2 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
- MDRV_SOUND_CONFIG( psxspu_interface )
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.35)
+ MCFG_SOUND_ADD( "spu", PSXSPU, 0 )
+ MCFG_SOUND_CONFIG( psxspu_interface )
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
- MDRV_MACHINE_RESET( coh3002t )
+ MCFG_MACHINE_RESET( coh3002t )
- MDRV_AT28C16_ADD( "at28c16", 0 )
- MDRV_IDE_CONTROLLER_ADD( "card", 0 )
+ MCFG_AT28C16_ADD( "at28c16", 0 )
+ MCFG_IDE_CONTROLLER_ADD( "card", 0 )
- MDRV_MB3773_ADD("mb3773")
+ MCFG_MB3773_ADD("mb3773")
- MDRV_INTEL_TE28F160_ADD("biosflash")
- MDRV_INTEL_E28F400_ADD("pgmflash")
- MDRV_INTEL_TE28F160_ADD("sndflash0")
- MDRV_INTEL_TE28F160_ADD("sndflash1")
- MDRV_INTEL_TE28F160_ADD("sndflash2")
+ MCFG_INTEL_TE28F160_ADD("biosflash")
+ MCFG_INTEL_E28F400_ADD("pgmflash")
+ MCFG_INTEL_TE28F160_ADD("sndflash0")
+ MCFG_INTEL_TE28F160_ADD("sndflash1")
+ MCFG_INTEL_TE28F160_ADD("sndflash2")
- MDRV_FRAGMENT_ADD( taito_zoom_sound )
+ MCFG_FRAGMENT_ADD( taito_zoom_sound )
MACHINE_CONFIG_END
static INPUT_PORTS_START( coh3002t )
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index a589ebccba7..900d5674ba7 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -1314,39 +1314,39 @@ static const hc11_config taitojc_config =
static MACHINE_CONFIG_START( taitojc, taitojc_state )
- MDRV_CPU_ADD("maincpu", M68040, 25000000)
- MDRV_CPU_PROGRAM_MAP(taitojc_map)
- MDRV_CPU_VBLANK_INT("screen", taitojc_vblank)
- MDRV_CPU_PERIODIC_INT(taitojc_int6, 1000)
+ MCFG_CPU_ADD("maincpu", M68040, 25000000)
+ MCFG_CPU_PROGRAM_MAP(taitojc_map)
+ MCFG_CPU_VBLANK_INT("screen", taitojc_vblank)
+ MCFG_CPU_PERIODIC_INT(taitojc_int6, 1000)
- MDRV_CPU_ADD("sub", MC68HC11, 4000000) //MC68HC11M0
- MDRV_CPU_PROGRAM_MAP(hc11_pgm_map)
- MDRV_CPU_IO_MAP(hc11_io_map)
- MDRV_CPU_CONFIG(taitojc_config)
+ MCFG_CPU_ADD("sub", MC68HC11, 4000000) //MC68HC11M0
+ MCFG_CPU_PROGRAM_MAP(hc11_pgm_map)
+ MCFG_CPU_IO_MAP(hc11_io_map)
+ MCFG_CPU_CONFIG(taitojc_config)
- MDRV_CPU_ADD("dsp", TMS32051, 50000000)
- MDRV_CPU_PROGRAM_MAP(tms_program_map)
- MDRV_CPU_DATA_MAP(tms_data_map)
+ MCFG_CPU_ADD("dsp", TMS32051, 50000000)
+ MCFG_CPU_PROGRAM_MAP(tms_program_map)
+ MCFG_CPU_DATA_MAP(tms_data_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET(taitojc)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_RESET(taitojc)
+ MCFG_EEPROM_93C46_ADD("eeprom")
- 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, 400)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 399)
+ 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, 400)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 399)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_VIDEO_START(taitojc)
- MDRV_VIDEO_UPDATE(taitojc)
+ MCFG_VIDEO_START(taitojc)
+ MCFG_VIDEO_UPDATE(taitojc)
/* sound hardware */
- MDRV_FRAGMENT_ADD(taito_f3_sound)
+ MCFG_FRAGMENT_ADD(taito_f3_sound)
MACHINE_CONFIG_END
static DRIVER_INIT( taitojc )
diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c
index 3b09245de2c..7dce83c3496 100644
--- a/src/mame/drivers/taitopjc.c
+++ b/src/mame/drivers/taitopjc.c
@@ -87,23 +87,23 @@ static const powerpc_config ppc603e_config =
};
static MACHINE_CONFIG_START( taitopjc, driver_device )
- MDRV_CPU_ADD("maincpu", PPC603E, 100000000)
- MDRV_CPU_CONFIG(ppc603e_config)
- MDRV_CPU_PROGRAM_MAP(ppc603e_mem)
+ MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
+ MCFG_CPU_CONFIG(ppc603e_config)
+ MCFG_CPU_PROGRAM_MAP(ppc603e_mem)
/* TMP95C063F I/O CPU */
/* TMS320C53 DSP */
/* MN1020819DA sound CPU - NOTE: May have 64kB internal ROM */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
- MDRV_VIDEO_START(taitopjc)
- MDRV_VIDEO_UPDATE(taitopjc)
+ MCFG_VIDEO_START(taitopjc)
+ MCFG_VIDEO_UPDATE(taitopjc)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index ed8836e14f7..1b9e6e49afc 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -1793,56 +1793,56 @@ static const ay8910_interface ay8910_interface_4 =
static MACHINE_CONFIG_START( nomcu, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000/2) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(taitosj_main_nomcu_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,8000000/2) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(taitosj_main_nomcu_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,6000000/2) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(taitosj_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80,6000000/2) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(taitosj_audio_map)
/* interrupts: */
/* - no interrupts synced with vblank */
/* - NMI triggered by the main CPU */
/* - periodic IRQ, with frequency 6000000/(4*16*16*10*16) = 36.621 Hz, */
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16))
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16))
- MDRV_MACHINE_START(taitosj)
- MDRV_MACHINE_RESET(taitosj)
+ MCFG_MACHINE_START(taitosj)
+ MCFG_MACHINE_RESET(taitosj)
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(taitosj)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(taitosj)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_VIDEO_START(taitosj)
- MDRV_VIDEO_UPDATE(taitosj)
+ MCFG_VIDEO_START(taitosj)
+ MCFG_VIDEO_UPDATE(taitosj)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 6000000/4)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8910, 6000000/4)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8910, 6000000/4)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8910, 6000000/4)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay3", AY8910, 6000000/4)
- MDRV_SOUND_CONFIG(ay8910_interface_3)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay3", AY8910, 6000000/4)
+ MCFG_SOUND_CONFIG(ay8910_interface_3)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay4", AY8910, 6000000/4)
- MDRV_SOUND_CONFIG(ay8910_interface_4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ay4", AY8910, 6000000/4)
+ MCFG_SOUND_CONFIG(ay8910_interface_4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- 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
@@ -1850,23 +1850,23 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcu, nomcu )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(taitosj_main_mcu_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(taitosj_main_mcu_map)
- MDRV_CPU_ADD("mcu", M68705,3000000) /* xtal is 3MHz, divided by 4 internally */
- MDRV_CPU_PROGRAM_MAP(taitosj_mcu_map)
+ MCFG_CPU_ADD("mcu", M68705,3000000) /* xtal is 3MHz, divided by 4 internally */
+ MCFG_CPU_PROGRAM_MAP(taitosj_mcu_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kikstart, mcu )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(kikstart_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(kikstart_main_map)
- MDRV_VIDEO_UPDATE(kikstart)
+ MCFG_VIDEO_UPDATE(kikstart)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index 719ecba937f..0cd0f8f8386 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -103,22 +103,22 @@ static const powerpc_config ppc603e_config =
static MACHINE_CONFIG_START( taitotz, driver_device )
- MDRV_CPU_ADD("maincpu", PPC603E, 100000000)
- MDRV_CPU_CONFIG(ppc603e_config)
- MDRV_CPU_PROGRAM_MAP(ppc603e_mem)
+ MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
+ MCFG_CPU_CONFIG(ppc603e_config)
+ MCFG_CPU_PROGRAM_MAP(ppc603e_mem)
/* TMP95C063F I/O CPU */
/* MN1020819DA sound CPU */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(512, 384)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(512, 384)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383)
- MDRV_VIDEO_START(taitotz)
- MDRV_VIDEO_UPDATE(taitotz)
+ MCFG_VIDEO_START(taitotz)
+ MCFG_VIDEO_UPDATE(taitotz)
MACHINE_CONFIG_END
#define TAITOTZ_BIOS \
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 1a9f1211f2c..9a76413a9f5 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -600,44 +600,44 @@ static const struct pit8253_config taitowlf_pit8254_config =
static MACHINE_CONFIG_START( taitowlf, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PENTIUM, 200000000)
- MDRV_CPU_PROGRAM_MAP(taitowlf_map)
- MDRV_CPU_IO_MAP(taitowlf_io)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 200000000)
+ MCFG_CPU_PROGRAM_MAP(taitowlf_map)
+ MCFG_CPU_IO_MAP(taitowlf_io)
- MDRV_MACHINE_START(taitowlf)
- MDRV_MACHINE_RESET(taitowlf)
+ MCFG_MACHINE_START(taitowlf)
+ MCFG_MACHINE_RESET(taitowlf)
- MDRV_PCI_BUS_ADD("pcibus", 0)
- MDRV_PCI_BUS_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w)
- MDRV_PCI_BUS_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
+ MCFG_PCI_BUS_ADD("pcibus", 0)
+ MCFG_PCI_BUS_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w)
+ MCFG_PCI_BUS_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
- MDRV_PIT8254_ADD( "pit8254", taitowlf_pit8254_config )
+ MCFG_PIT8254_ADD( "pit8254", taitowlf_pit8254_config )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
+ MCFG_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
- MDRV_PIC8259_ADD( "pic8259_1", taitowlf_pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_1", taitowlf_pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", taitowlf_pic8259_2_config )
+ MCFG_PIC8259_ADD( "pic8259_2", taitowlf_pic8259_2_config )
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
- MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
/* 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
-
- MDRV_GFXDECODE(CGA)
- MDRV_PALETTE_LENGTH(16)
-
- MDRV_VIDEO_START(taitowlf)
- MDRV_VIDEO_UPDATE(taitowlf)
+ 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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
+
+ MCFG_GFXDECODE(CGA)
+ MCFG_PALETTE_LENGTH(16)
+
+ MCFG_VIDEO_START(taitowlf)
+ MCFG_VIDEO_UPDATE(taitowlf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index 65d1848a598..d9bcfd1df47 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -327,35 +327,35 @@ GFXDECODE_END
static MACHINE_CONFIG_START( tank8, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, 11055000 / 10) /* ? */
- MDRV_CPU_PROGRAM_MAP(tank8_cpu_map)
+ MCFG_CPU_ADD("maincpu", M6800, 11055000 / 10) /* ? */
+ MCFG_CPU_PROGRAM_MAP(tank8_cpu_map)
- MDRV_MACHINE_RESET(tank8)
+ MCFG_MACHINE_RESET(tank8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(30 * 1000000 / 15681))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 524)
- MDRV_SCREEN_VISIBLE_AREA(16, 495, 0, 463)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(30 * 1000000 / 15681))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 524)
+ MCFG_SCREEN_VISIBLE_AREA(16, 495, 0, 463)
- MDRV_GFXDECODE(tank8)
- MDRV_PALETTE_LENGTH(20)
+ MCFG_GFXDECODE(tank8)
+ MCFG_PALETTE_LENGTH(20)
- MDRV_PALETTE_INIT(tank8)
- MDRV_VIDEO_START(tank8)
- MDRV_VIDEO_UPDATE(tank8)
- MDRV_VIDEO_EOF(tank8)
+ MCFG_PALETTE_INIT(tank8)
+ MCFG_VIDEO_START(tank8)
+ MCFG_VIDEO_UPDATE(tank8)
+ MCFG_VIDEO_EOF(tank8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(tank8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(tank8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index a26228ad1bd..72ac36592de 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -292,31 +292,31 @@ static const samples_interface tankbatt_samples_interface =
static MACHINE_CONFIG_START( tankbatt, tankbatt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", tankbatt_interrupt)
+ MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", tankbatt_interrupt)
/* 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)
+ 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)
- MDRV_GFXDECODE(tankbatt)
- MDRV_PALETTE_LENGTH(256*2)
+ MCFG_GFXDECODE(tankbatt)
+ MCFG_PALETTE_LENGTH(256*2)
- MDRV_PALETTE_INIT(tankbatt)
- MDRV_VIDEO_START(tankbatt)
- MDRV_VIDEO_UPDATE(tankbatt)
+ MCFG_PALETTE_INIT(tankbatt)
+ MCFG_VIDEO_START(tankbatt)
+ MCFG_VIDEO_UPDATE(tankbatt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(tankbatt_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(tankbatt_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 589ede1dd25..8bd40d72819 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -325,46 +325,46 @@ static MACHINE_RESET( tankbust )
static MACHINE_CONFIG_START( tankbust, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) /* Verified on PCB */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) /* Verified on PCB */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_14_31818MHz/4) /* Verified on PCB */
-// MDRV_CPU_ADD("sub", Z80, XTAL_14_31818MHz/3) /* Accurate to audio recording, but apparently incorrect clock */
+ MCFG_CPU_ADD("sub", Z80, XTAL_14_31818MHz/4) /* Verified on PCB */
+// MCFG_CPU_ADD("sub", Z80, XTAL_14_31818MHz/3) /* Accurate to audio recording, but apparently incorrect clock */
- MDRV_CPU_PROGRAM_MAP(map_cpu2)
- MDRV_CPU_IO_MAP(port_map_cpu2)
+ MCFG_CPU_PROGRAM_MAP(map_cpu2)
+ MCFG_CPU_IO_MAP(port_map_cpu2)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET( tankbust )
+ MCFG_MACHINE_RESET( tankbust )
/* 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 ( 16*8, 56*8-1, 1*8, 31*8-1 )
-// MDRV_SCREEN_VISIBLE_AREA ( 0*8, 64*8-1, 1*8, 31*8-1 )
+ 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 ( 16*8, 56*8-1, 1*8, 31*8-1 )
+// MCFG_SCREEN_VISIBLE_AREA ( 0*8, 64*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE( tankbust )
+ MCFG_GFXDECODE( tankbust )
- MDRV_PALETTE_LENGTH( 128 )
- MDRV_PALETTE_INIT ( tankbust )
+ MCFG_PALETTE_LENGTH( 128 )
+ MCFG_PALETTE_INIT ( tankbust )
- MDRV_VIDEO_START ( tankbust )
- MDRV_VIDEO_UPDATE ( tankbust )
+ MCFG_VIDEO_START ( tankbust )
+ MCFG_VIDEO_UPDATE ( tankbust )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_14_31818MHz/16) /* Verified on PCB */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_14_31818MHz/16) /* Verified on PCB */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_14_31818MHz/16) /* Verified on PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_14_31818MHz/16) /* Verified on PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 1d59aeac781..9b07a4d69f6 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -331,39 +331,39 @@ static const ym2610_interface ym2610_config =
};
static MACHINE_CONFIG_START( taotaido, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,20000000/4) // ??
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_port_map)
+ MCFG_CPU_ADD("audiocpu", Z80,20000000/4) // ??
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2610 */
- MDRV_GFXDECODE(taotaido)
+ MCFG_GFXDECODE(taotaido)
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(taotaido)
- MDRV_VIDEO_UPDATE(taotaido)
- MDRV_VIDEO_EOF( taotaido )
+ MCFG_VIDEO_START(taotaido)
+ MCFG_VIDEO_UPDATE(taotaido)
+ MCFG_VIDEO_EOF( taotaido )
/* 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
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index be01d03c0c7..e00d8e4eb5d 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -170,29 +170,29 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( targeth, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(targeth_interrupt,3)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(targeth_interrupt,3)
/* 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*16, 32*16) /* 1024x512 */
- MDRV_SCREEN_VISIBLE_AREA(0, 24*16-1, 16, 16*16-1) /* 400x240 */
+ 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*16, 32*16) /* 1024x512 */
+ MCFG_SCREEN_VISIBLE_AREA(0, 24*16-1, 16, 16*16-1) /* 400x240 */
- MDRV_GFXDECODE(0x080000)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(0x080000)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(targeth)
- MDRV_VIDEO_UPDATE(targeth)
+ MCFG_VIDEO_START(targeth)
+ MCFG_VIDEO_UPDATE(targeth)
/* 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
ROM_START( targeth )
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 91298ea3a0b..bcacdd36691 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -859,175 +859,175 @@ static MACHINE_RESET( apache3 )
static MACHINE_CONFIG_START( apache3, tatsumi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
- MDRV_CPU_PROGRAM_MAP(apache3_v30_map)
- MDRV_CPU_VBLANK_INT("screen", roundup5_interrupt)
+ MCFG_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
+ MCFG_CPU_PROGRAM_MAP(apache3_v30_map)
+ MCFG_CPU_VBLANK_INT("screen", roundup5_interrupt)
- MDRV_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(apache3_68000_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000, CLOCK_2 / 4)
+ MCFG_CPU_PROGRAM_MAP(apache3_68000_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", V20, CLOCK_1 / 2)
- MDRV_CPU_PROGRAM_MAP(apache3_v20_map)
+ MCFG_CPU_ADD("audiocpu", V20, CLOCK_1 / 2)
+ MCFG_CPU_PROGRAM_MAP(apache3_v20_map)
- MDRV_CPU_ADD("sub2", Z80, CLOCK_2 / 8)
- MDRV_CPU_PROGRAM_MAP(apache3_z80_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub2", Z80, CLOCK_2 / 8)
+ MCFG_CPU_PROGRAM_MAP(apache3_z80_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(6000))
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_RESET(apache3)
+ MCFG_QUANTUM_TIME(HZ(6000))
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(apache3)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(CLOCK_2 / 8, 400, 0, 320, 280, 0, 240) // TODO: Hook up CRTC
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(CLOCK_2 / 8, 400, 0, 320, 280, 0, 240) // TODO: Hook up CRTC
- MDRV_GFXDECODE(apache3)
- MDRV_PALETTE_LENGTH(1024 + 4096) /* 1024 real colours, and 4096 arranged as series of cluts */
+ MCFG_GFXDECODE(apache3)
+ MCFG_PALETTE_LENGTH(1024 + 4096) /* 1024 real colours, and 4096 arranged as series of cluts */
- MDRV_VIDEO_START(apache3)
- MDRV_VIDEO_UPDATE(apache3)
+ MCFG_VIDEO_START(apache3)
+ MCFG_VIDEO_UPDATE(apache3)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", CLOCK_1 / 4 / 2, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki", CLOCK_1 / 4 / 2, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( roundup5, tatsumi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
- MDRV_CPU_PROGRAM_MAP(roundup5_v30_map)
- MDRV_CPU_VBLANK_INT("screen", roundup5_interrupt)
+ MCFG_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
+ MCFG_CPU_PROGRAM_MAP(roundup5_v30_map)
+ MCFG_CPU_VBLANK_INT("screen", roundup5_interrupt)
- MDRV_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(roundup5_68000_map)
+ MCFG_CPU_ADD("sub", M68000, CLOCK_2 / 4)
+ MCFG_CPU_PROGRAM_MAP(roundup5_68000_map)
- MDRV_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MDRV_CPU_PROGRAM_MAP(roundup5_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
+ MCFG_CPU_PROGRAM_MAP(roundup5_z80_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(roundup5)
- MDRV_PALETTE_LENGTH(1024 + 4096) /* 1024 real colours, and 4096 arranged as series of cluts */
+ MCFG_GFXDECODE(roundup5)
+ MCFG_PALETTE_LENGTH(1024 + 4096) /* 1024 real colours, and 4096 arranged as series of cluts */
- MDRV_VIDEO_START(roundup5)
- MDRV_VIDEO_UPDATE(roundup5)
+ MCFG_VIDEO_START(roundup5)
+ MCFG_VIDEO_UPDATE(roundup5)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", CLOCK_1 / 4 / 2, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki", CLOCK_1 / 4 / 2, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cyclwarr, tatsumi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(cyclwarr_68000a_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
+ MCFG_CPU_PROGRAM_MAP(cyclwarr_68000a_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(cyclwarr_68000b_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("sub", M68000, CLOCK_2 / 4)
+ MCFG_CPU_PROGRAM_MAP(cyclwarr_68000b_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
+ MCFG_CPU_PROGRAM_MAP(cyclwarr_z80_map)
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
/* 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_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(cyclwarr)
- MDRV_PALETTE_LENGTH(8192 + 8192)
+ MCFG_GFXDECODE(cyclwarr)
+ MCFG_PALETTE_LENGTH(8192 + 8192)
- MDRV_VIDEO_START(cyclwarr)
- MDRV_VIDEO_UPDATE(cyclwarr)
+ MCFG_VIDEO_START(cyclwarr)
+ MCFG_VIDEO_UPDATE(cyclwarr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", CLOCK_1 / 8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki", CLOCK_1 / 8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bigfight, tatsumi_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(bigfight_68000a_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
+ MCFG_CPU_PROGRAM_MAP(bigfight_68000a_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MDRV_CPU_PROGRAM_MAP(bigfight_68000b_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("sub", M68000, CLOCK_2 / 4)
+ MCFG_CPU_PROGRAM_MAP(bigfight_68000b_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
+ MCFG_CPU_PROGRAM_MAP(cyclwarr_z80_map)
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
/* 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_RGB32)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ 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_RGB32)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(cyclwarr)
- MDRV_PALETTE_LENGTH(8192 + 8192)
+ MCFG_GFXDECODE(cyclwarr)
+ MCFG_PALETTE_LENGTH(8192 + 8192)
- MDRV_VIDEO_START(bigfight)
- MDRV_VIDEO_UPDATE(bigfight)
+ MCFG_VIDEO_START(bigfight)
+ MCFG_VIDEO_UPDATE(bigfight)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, CLOCK_1 / 4)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", CLOCK_1 / 8 / 2, OKIM6295_PIN7_HIGH) /* 2MHz was too fast. Can the clock be software controlled? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki", CLOCK_1 / 8 / 2, OKIM6295_PIN7_HIGH) /* 2MHz was too fast. Can the clock be software controlled? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c
index e6e96aec1bd..6fe534db12c 100644
--- a/src/mame/drivers/tattack.c
+++ b/src/mame/drivers/tattack.c
@@ -183,24 +183,24 @@ static PALETTE_INIT( tattack )
static MACHINE_CONFIG_START( tattack, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000 / 2) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(mem)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000 / 2) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(mem)
+ 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
-
- MDRV_GFXDECODE(tattack)
- MDRV_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(tattack )
-
- MDRV_VIDEO_UPDATE(tattack)
- MDRV_VIDEO_START(tattack)
+ 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(0*8, 32*8-1, 0*8, 32*8-1)
+
+ MCFG_GFXDECODE(tattack)
+ MCFG_PALETTE_LENGTH(16)
+ MCFG_PALETTE_INIT(tattack )
+
+ MCFG_VIDEO_UPDATE(tattack)
+ MCFG_VIDEO_START(tattack)
/* sound hardware */
/* Discrete ???? */
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 91d59ab167f..90dde663ac0 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -361,51 +361,51 @@ static const ay8910_interface ay8910_interface_2 =
static MACHINE_CONFIG_START( taxidrvr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
+ MCFG_CPU_ADD("sub", Z80,4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
- MDRV_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpu3_map)
- MDRV_CPU_IO_MAP(cpu3_port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(cpu3_map)
+ MCFG_CPU_IO_MAP(cpu3_port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* ??? */
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
- MDRV_PPI8255_ADD( "ppi8255_3", ppi8255_intf[3] )
- MDRV_PPI8255_ADD( "ppi8255_4", ppi8255_intf[4] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_3", ppi8255_intf[3] )
+ MCFG_PPI8255_ADD( "ppi8255_4", ppi8255_intf[4] )
/* 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, 1*8, 27*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, 32*8-1, 1*8, 27*8-1)
- MDRV_GFXDECODE(taxidrvr)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(taxidrvr)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_UPDATE(taxidrvr)
+ MCFG_VIDEO_UPDATE(taxidrvr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1250000)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1250000)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 07888fee697..10de5e461ca 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -465,63 +465,63 @@ static MACHINE_RESET( tbowl )
static MACHINE_CONFIG_START( tbowl, driver_device )
/* CPU on Board '6206B' */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
- MDRV_CPU_PROGRAM_MAP(6206B_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
+ MCFG_CPU_PROGRAM_MAP(6206B_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq0_line_hold)
/* CPU on Board '6206C' */
- MDRV_CPU_ADD("sub", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
- MDRV_CPU_PROGRAM_MAP(6206C_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
+ MCFG_CPU_PROGRAM_MAP(6206C_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq0_line_hold)
/* CPU on Board '6206A' */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* Actual Z80 */
- MDRV_CPU_PROGRAM_MAP(6206A_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* Actual Z80 */
+ MCFG_CPU_PROGRAM_MAP(6206A_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_GFXDECODE(tbowl)
- MDRV_PALETTE_LENGTH(1024*2)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_GFXDECODE(tbowl)
+ MCFG_PALETTE_LENGTH(1024*2)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_ADD("lscreen", 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("lscreen", 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_SCREEN_ADD("rscreen", 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("rscreen", 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_VIDEO_START(tbowl)
- MDRV_VIDEO_UPDATE(tbowl)
+ MCFG_VIDEO_START(tbowl)
+ MCFG_VIDEO_UPDATE(tbowl)
- MDRV_MACHINE_RESET( tbowl )
+ MCFG_MACHINE_RESET( tbowl )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM3812, 4000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym1", YM3812, 4000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("ym2", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ym2", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* something for the samples? */
- MDRV_SOUND_ADD("msm1", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm1", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("msm2", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 7a34543a178..aafc94ef911 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -366,79 +366,79 @@ static MACHINE_RESET( tceptor )
static MACHINE_CONFIG_START( tceptor, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 49152000/32)
- MDRV_CPU_PROGRAM_MAP(m6809_map)
- MDRV_CPU_VBLANK_INT("2dscreen", m6809_vb_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, 49152000/32)
+ MCFG_CPU_PROGRAM_MAP(m6809_map)
+ MCFG_CPU_VBLANK_INT("2dscreen", m6809_vb_interrupt)
- MDRV_CPU_ADD("audiocpu", M65C02, 49152000/24)
- MDRV_CPU_PROGRAM_MAP(m6502_a_map)
+ MCFG_CPU_ADD("audiocpu", M65C02, 49152000/24)
+ MCFG_CPU_PROGRAM_MAP(m6502_a_map)
- MDRV_CPU_ADD("audio2", M65C02, 49152000/24)
- MDRV_CPU_PROGRAM_MAP(m6502_b_map)
+ MCFG_CPU_ADD("audio2", M65C02, 49152000/24)
+ MCFG_CPU_PROGRAM_MAP(m6502_b_map)
- MDRV_CPU_ADD("sub", M68000, 49152000/4)
- MDRV_CPU_PROGRAM_MAP(m68k_map)
- MDRV_CPU_VBLANK_INT("2dscreen", m68k_vb_interrupt)
+ MCFG_CPU_ADD("sub", M68000, 49152000/4)
+ MCFG_CPU_PROGRAM_MAP(m68k_map)
+ MCFG_CPU_VBLANK_INT("2dscreen", m68k_vb_interrupt)
- MDRV_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
- MDRV_CPU_IO_MAP(mcu_io_map)
- MDRV_CPU_VBLANK_INT("2dscreen", mcu_vb_interrupt)
+ MCFG_CPU_ADD("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_VBLANK_INT("2dscreen", mcu_vb_interrupt)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_MACHINE_START(tceptor)
- MDRV_MACHINE_RESET(tceptor)
+ MCFG_MACHINE_START(tceptor)
+ MCFG_MACHINE_RESET(tceptor)
/* video hardware */
- MDRV_GFXDECODE(tceptor)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_DEFAULT_LAYOUT(layout_horizont)
-
- MDRV_SCREEN_ADD("2dscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(38*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0)
-
- MDRV_SCREEN_ADD("3dleft", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(38*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0)
-
- MDRV_SCREEN_ADD("3dright", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(38*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0)
-
- MDRV_PALETTE_INIT(tceptor)
-
- MDRV_VIDEO_START(tceptor)
- MDRV_VIDEO_UPDATE(tceptor)
- MDRV_VIDEO_EOF(tceptor)
+ MCFG_GFXDECODE(tceptor)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_DEFAULT_LAYOUT(layout_horizont)
+
+ MCFG_SCREEN_ADD("2dscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(38*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0)
+
+ MCFG_SCREEN_ADD("3dleft", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(38*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0)
+
+ MCFG_SCREEN_ADD("3dright", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(38*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0)
+
+ MCFG_PALETTE_INIT(tceptor)
+
+ MCFG_VIDEO_START(tceptor)
+ MCFG_VIDEO_UPDATE(tceptor)
+ MCFG_VIDEO_EOF(tceptor)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 14318180/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index 328872aaaa0..acee09f81ea 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -115,31 +115,31 @@ static const ppi8255_interface ppi8255_intf[2] =
static MACHINE_CONFIG_START( tcl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/4)
- MDRV_CPU_PROGRAM_MAP(tcl_map)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/4)
+ MCFG_CPU_PROGRAM_MAP(tcl_map)
/* 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)
+ 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)
- MDRV_GFXDECODE(tcl)
- MDRV_PALETTE_LENGTH(16*16)
+ MCFG_GFXDECODE(tcl)
+ MCFG_PALETTE_LENGTH(16*16)
- MDRV_VIDEO_START(tcl)
- MDRV_VIDEO_UPDATE(tcl)
+ MCFG_VIDEO_START(tcl)
+ MCFG_VIDEO_UPDATE(tcl)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12000000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 12000000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 7adaf02a5cb..1a9b2209044 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -665,95 +665,95 @@ static MACHINE_RESET( rygar )
static MACHINE_CONFIG_START( rygar, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rygar_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rygar_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_4MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(rygar_sound_map)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_4MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(rygar_sound_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
+ 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)
- MDRV_GFXDECODE(tecmo)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tecmo)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(tecmo)
- MDRV_VIDEO_UPDATE(tecmo)
+ MCFG_VIDEO_START(tecmo)
+ MCFG_VIDEO_UPDATE(tecmo)
- MDRV_MACHINE_RESET( rygar )
+ MCFG_MACHINE_RESET( rygar )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb, even if schematics shows a 384khz resonator */
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb, even if schematics shows a 384khz resonator */
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gemini, rygar )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(6000000)
- MDRV_CPU_PROGRAM_MAP(gemini_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(6000000)
+ MCFG_CPU_PROGRAM_MAP(gemini_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(tecmo_sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(tecmo_sound_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( silkworm, gemini )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(6000000)
- MDRV_CPU_PROGRAM_MAP(silkworm_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(6000000)
+ MCFG_CPU_PROGRAM_MAP(silkworm_map)
MACHINE_CONFIG_END
#ifdef UNUSED_CODE
static MACHINE_CONFIG_START( backfirt, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4)
- MDRV_CPU_PROGRAM_MAP(rygar_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4)
+ MCFG_CPU_PROGRAM_MAP(rygar_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("soundcpu", Z80, XTAL_8MHz/2)
- MDRV_CPU_PROGRAM_MAP(rygar_sound_map)
+ MCFG_CPU_ADD("soundcpu", Z80, XTAL_8MHz/2)
+ MCFG_CPU_PROGRAM_MAP(rygar_sound_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* frames per second, vblank duration */)
+ 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)
- MDRV_GFXDECODE(tecmo)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tecmo)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(tecmo)
- MDRV_VIDEO_UPDATE(tecmo)
+ MCFG_VIDEO_START(tecmo)
+ MCFG_VIDEO_UPDATE(tecmo)
- MDRV_MACHINE_RESET( rygar )
+ MCFG_MACHINE_RESET( rygar )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* no MSM on this PCB */
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index 8dee8db79c4..099fef36eae 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -376,54 +376,54 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( fstarfrc, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12MHz */
- MDRV_CPU_PROGRAM_MAP(fstarfrc_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12MHz */
+ MCFG_CPU_PROGRAM_MAP(fstarfrc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main CPU */
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* 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_RGB32)
- 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_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(tecmo16)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(tecmo16)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(fstarfrc)
- MDRV_VIDEO_UPDATE(tecmo16)
+ MCFG_VIDEO_START(fstarfrc)
+ MCFG_VIDEO_UPDATE(tecmo16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 8000000/2)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 8000000/2)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_OKIM6295_ADD("oki", 999900, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_OKIM6295_ADD("oki", 999900, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ginkun, fstarfrc )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ginkun_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ginkun_map)
- MDRV_VIDEO_START(ginkun)
+ MCFG_VIDEO_START(ginkun)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( riot, ginkun )
/* basic machine hardware */
- MDRV_VIDEO_START(riot)
+ MCFG_VIDEO_START(riot)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index bb0ca4df10b..514a552d6d6 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -877,50 +877,50 @@ static const ymf262_interface tecmosys_ymf262_interface =
static MACHINE_CONFIG_START( deroon, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_WATCHDOG_VBLANK_INIT(400) // guess
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_WATCHDOG_VBLANK_INIT(400) // guess
- MDRV_CPU_ADD("audiocpu", Z80, 16000000/2 ) /* 8 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 16000000/2 ) /* 8 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(io_map)
- MDRV_GFXDECODE(tecmosys)
+ MCFG_GFXDECODE(tecmosys)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.4458)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3000))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.4458)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(3000))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x4000+0x800)
+ MCFG_PALETTE_LENGTH(0x4000+0x800)
- MDRV_VIDEO_START(deroon)
- MDRV_VIDEO_UPDATE(deroon)
+ MCFG_VIDEO_START(deroon)
+ MCFG_VIDEO_UPDATE(deroon)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymf", YMF262, 14318180)
- MDRV_SOUND_CONFIG(tecmosys_ymf262_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)
- MDRV_SOUND_ROUTE(2, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(3, "rspeaker", 1.00)
-
- MDRV_OKIM6295_ADD("oki", 16000000/8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
-
- MDRV_SOUND_ADD("ymz", YMZ280B, 16900000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.30)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymf", YMF262, 14318180)
+ MCFG_SOUND_CONFIG(tecmosys_ymf262_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
+
+ MCFG_OKIM6295_ADD("oki", 16000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16900000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index d2160b7a89b..fbfe85a3478 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -643,49 +643,49 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( tehkanwc, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/4) /* 18.432000 / 4 */
- MDRV_CPU_PROGRAM_MAP(main_mem)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/4) /* 18.432000 / 4 */
+ MCFG_CPU_PROGRAM_MAP(main_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, 18432000/4)
- MDRV_CPU_PROGRAM_MAP(sub_mem)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, 18432000/4)
+ MCFG_CPU_PROGRAM_MAP(sub_mem)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 18432000/4)
- MDRV_CPU_PROGRAM_MAP(sound_mem)
- MDRV_CPU_IO_MAP(sound_port)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, 18432000/4)
+ MCFG_CPU_PROGRAM_MAP(sound_mem)
+ MCFG_CPU_IO_MAP(sound_port)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - seems enough to keep the CPUs in sync */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - seems enough to keep the CPUs in sync */
/* 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(tehkanwc)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(tehkanwc)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(tehkanwc)
- MDRV_VIDEO_UPDATE(tehkanwc)
+ MCFG_VIDEO_START(tehkanwc)
+ MCFG_VIDEO_UPDATE(tehkanwc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1536000)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1536000)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1536000)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1536000)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index e825aefbbf4..3a49f513b3a 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -573,37 +573,37 @@ static const pokey_interface pokey_interface_2 =
static MACHINE_CONFIG_START( tempest, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
- MDRV_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 256))
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
+ MCFG_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 256))
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
- MDRV_MACHINE_START(tempest)
+ MCFG_MACHINE_START(tempest)
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 580, 0, 570)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 580, 0, 570)
- MDRV_VIDEO_START(avg_tempest)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(avg_tempest)
+ MCFG_VIDEO_UPDATE(vector)
/* Drivers */
- MDRV_MATHBOX_ADD("mathbox")
+ MCFG_MATHBOX_ADD("mathbox")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 17d83e702b9..26e0257b943 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -530,125 +530,125 @@ static GFXDECODE_START( terracre )
GFXDECODE_END
static MACHINE_CONFIG_START( amazon, terracre_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000 )
- MDRV_CPU_PROGRAM_MAP(amazon_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000 )
+ MCFG_CPU_PROGRAM_MAP(amazon_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_3526_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_3526_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
- MDRV_MACHINE_START(amazon)
+ MCFG_MACHINE_START(amazon)
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(terracre)
- MDRV_PALETTE_LENGTH(1*16+16*16+16*256)
+ MCFG_GFXDECODE(terracre)
+ MCFG_PALETTE_LENGTH(1*16+16*16+16*256)
- MDRV_PALETTE_INIT(amazon)
- MDRV_VIDEO_START(amazon)
- MDRV_VIDEO_UPDATE(amazon)
+ MCFG_PALETTE_INIT(amazon)
+ MCFG_VIDEO_START(amazon)
+ MCFG_VIDEO_UPDATE(amazon)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ym3526, terracre_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000 )
- MDRV_CPU_PROGRAM_MAP(terracre_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000 )
+ MCFG_CPU_PROGRAM_MAP(terracre_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_3526_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_3526_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(terracre)
- MDRV_PALETTE_LENGTH(1*16+16*16+16*256)
+ MCFG_GFXDECODE(terracre)
+ MCFG_PALETTE_LENGTH(1*16+16*16+16*256)
- MDRV_PALETTE_INIT(amazon)
- MDRV_VIDEO_START(amazon)
- MDRV_VIDEO_UPDATE(amazon)
+ MCFG_PALETTE_INIT(amazon)
+ MCFG_VIDEO_START(amazon)
+ MCFG_VIDEO_UPDATE(amazon)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3526, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3526, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ym2203, terracre_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(terracre_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(terracre_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_2203_io_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_2203_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */
- 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)
+ 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)
- MDRV_GFXDECODE(terracre)
- MDRV_PALETTE_LENGTH(1*16+16*16+16*256)
+ MCFG_GFXDECODE(terracre)
+ MCFG_PALETTE_LENGTH(1*16+16*16+16*256)
- MDRV_PALETTE_INIT(amazon)
- MDRV_VIDEO_START(amazon)
- MDRV_VIDEO_UPDATE(amazon)
+ MCFG_PALETTE_INIT(amazon)
+ MCFG_VIDEO_START(amazon)
+ MCFG_VIDEO_UPDATE(amazon)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.40)
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ROUTE(2, "mono", 0.20)
- MDRV_SOUND_ROUTE(3, "mono", 0.40)
+ MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ROUTE(2, "mono", 0.20)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
ROM_START( terracre )
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 9c1b2cab144..0996726abe0 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -1093,174 +1093,174 @@ static DRIVER_INIT( rockn3 )
static MACHINE_CONFIG_START( tetrisp2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(tetrisp2_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(tetrisp2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_WATCHDOG_VBLANK_INIT(8) /* guess */
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_WATCHDOG_VBLANK_INIT(8) /* guess */
/* 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(0x140, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-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(0x140, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
- MDRV_GFXDECODE(tetrisp2)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(tetrisp2)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_VIDEO_START(tetrisp2)
- MDRV_VIDEO_UPDATE(tetrisp2)
+ MCFG_VIDEO_START(tetrisp2)
+ MCFG_VIDEO_UPDATE(tetrisp2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( nndmseal, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(nndmseal_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_PROGRAM_MAP(nndmseal_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- 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(0x180, 0xf0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xf0-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(0x180, 0xf0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xf0-1)
- MDRV_GFXDECODE(tetrisp2)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(tetrisp2)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_VIDEO_START(nndmseal) // bg layer offset
- MDRV_VIDEO_UPDATE(tetrisp2)
+ MCFG_VIDEO_START(nndmseal) // bg layer offset
+ MCFG_VIDEO_UPDATE(tetrisp2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_2MHz, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_2MHz, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rockn, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(rockn1_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(rockn1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- 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(0x140, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-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(0x140, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
- MDRV_GFXDECODE(tetrisp2)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(tetrisp2)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_VIDEO_START(rockntread)
- MDRV_VIDEO_UPDATE(rockntread)
+ MCFG_VIDEO_START(rockntread)
+ MCFG_VIDEO_UPDATE(rockntread)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rockn2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(rockn2_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(rockn2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- 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(0x140, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-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(0x140, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
- MDRV_GFXDECODE(tetrisp2)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(tetrisp2)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_VIDEO_START(rockntread)
- MDRV_VIDEO_UPDATE(rockntread)
+ MCFG_VIDEO_START(rockntread)
+ MCFG_VIDEO_UPDATE(rockntread)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rocknms, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(rocknms_main_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(rocknms_main_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq2_line_hold)
- MDRV_CPU_ADD("sub", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(rocknms_sub_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq2_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(rocknms_sub_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq2_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_GFXDECODE(rocknms)
- MDRV_PALETTE_LENGTH(0x10000)
- MDRV_DEFAULT_LAYOUT(layout_rocknms)
+ MCFG_GFXDECODE(rocknms)
+ MCFG_PALETTE_LENGTH(0x10000)
+ MCFG_DEFAULT_LAYOUT(layout_rocknms)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(0x140, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(0x140, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(0x140, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(0x140, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
- MDRV_VIDEO_START(rocknms)
- MDRV_VIDEO_UPDATE(rocknms)
+ MCFG_VIDEO_START(rocknms)
+ MCFG_VIDEO_UPDATE(rocknms)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c
index 446dac39ccd..1e253d38661 100644
--- a/src/mame/drivers/tgtpanic.c
+++ b/src/mame/drivers/tgtpanic.c
@@ -120,20 +120,20 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( tgtpanic, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(prg_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 20) /* Unverified */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_PROGRAM_MAP(prg_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 20) /* Unverified */
/* video hardware */
- MDRV_VIDEO_UPDATE(tgtpanic)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60) /* Unverified */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* Unverified */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 192 - 1, 0, 192 - 1)
+ MCFG_VIDEO_UPDATE(tgtpanic)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60) /* Unverified */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* Unverified */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 192 - 1, 0, 192 - 1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index 6743f8fdaa5..f4f2bb89da7 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -757,31 +757,31 @@ static COP400_INTERFACE( thayers_cop_intf )
static MACHINE_CONFIG_START( thayers, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(thayers_map)
- MDRV_CPU_IO_MAP(thayers_io_map)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
+ MCFG_CPU_PROGRAM_MAP(thayers_map)
+ MCFG_CPU_IO_MAP(thayers_io_map)
- MDRV_CPU_ADD("mcu", COP421, XTAL_4MHz/2) // COP421L-PCA/N
- MDRV_CPU_IO_MAP(thayers_cop_io_map)
- MDRV_CPU_CONFIG(thayers_cop_intf)
+ MCFG_CPU_ADD("mcu", COP421, XTAL_4MHz/2) // COP421L-PCA/N
+ MCFG_CPU_IO_MAP(thayers_cop_io_map)
+ MCFG_CPU_CONFIG(thayers_cop_intf)
- MDRV_MACHINE_START(thayers)
- MDRV_MACHINE_RESET(thayers)
+ MCFG_MACHINE_START(thayers)
+ MCFG_MACHINE_RESET(thayers)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_PR7820, "screen", "ldsound")
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_PR7820, "screen", "ldsound")
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
// SSI 263 @ 2MHz
- 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
/* ROMs */
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index 9fe47868537..698213ffdfc 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -352,39 +352,39 @@ static INTERRUPT_GEN( thedeep_interrupt )
static MACHINE_CONFIG_START( thedeep, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(thedeep_interrupt,2) /* IRQ by MCU, NMI by vblank (maskable) */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(thedeep_interrupt,2) /* IRQ by MCU, NMI by vblank (maskable) */
- MDRV_CPU_ADD("audiocpu", M65C02, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", M65C02, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
/* IRQ by YM2203, NMI by when sound latch written by main cpu */
/* CPU3 is a i8751 running at 8Mhz (8mhz xtal)*/
- MDRV_MACHINE_RESET(thedeep)
+ MCFG_MACHINE_RESET(thedeep)
/* 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(0x100, 0xf8)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x100-1, 0, 0xf8-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(0x100, 0xf8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x100-1, 0, 0xf8-1)
- MDRV_GFXDECODE(thedeep)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(thedeep)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(thedeep)
- MDRV_VIDEO_START(thedeep)
- MDRV_VIDEO_UPDATE(thedeep)
+ MCFG_PALETTE_INIT(thedeep)
+ MCFG_VIDEO_START(thedeep)
+ MCFG_VIDEO_UPDATE(thedeep)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(thedeep_ym2203_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(thedeep_ym2203_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 9d56671fef5..62c6716eec9 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -633,47 +633,47 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( thepit, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(thepit_main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(thepit_main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 2.5 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map)
- MDRV_CPU_IO_MAP(audio_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 2.5 MHz */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_IO_MAP(audio_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_GFXDECODE(thepit)
- MDRV_PALETTE_LENGTH(32+8)
+ MCFG_GFXDECODE(thepit)
+ MCFG_PALETTE_LENGTH(32+8)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(thepit)
- MDRV_VIDEO_START(thepit)
- MDRV_VIDEO_UPDATE(thepit)
+ MCFG_PALETTE_INIT(thepit)
+ MCFG_VIDEO_START(thepit)
+ MCFG_VIDEO_UPDATE(thepit)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, PIXEL_CLOCK/4)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, PIXEL_CLOCK/4)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, PIXEL_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, PIXEL_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( intrepid, thepit )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(intrepid_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(intrepid_main_map)
/* video hardware */
- MDRV_GFXDECODE(intrepid)
+ MCFG_GFXDECODE(intrepid)
MACHINE_CONFIG_END
@@ -682,8 +682,8 @@ static MACHINE_CONFIG_DERIVED( suprmous, intrepid )
/* basic machine hardware */
/* video hardware */
- MDRV_PALETTE_INIT(suprmous)
- MDRV_GFXDECODE(suprmous)
+ MCFG_PALETTE_INIT(suprmous)
+ MCFG_GFXDECODE(suprmous)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index c2c59947498..5536e38b4d3 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -436,114 +436,114 @@ static const tms9927_interface tms9927_intf =
static MACHINE_CONFIG_START( sharkatt, thief_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(sharkatt_main_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", thief_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sharkatt_main_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", thief_interrupt)
/* video hardware */
- 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, 0*8, 24*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, 0*8, 24*8-1)
- MDRV_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf)
+ MCFG_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(thief)
- MDRV_VIDEO_UPDATE(thief)
+ MCFG_VIDEO_START(thief)
+ MCFG_VIDEO_UPDATE(thief)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 4000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, 4000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 4000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 4000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(sharkatt_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(sharkatt_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( thief, thief_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(thief_main_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", thief_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(thief_main_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", thief_interrupt)
/* 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, 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf)
+ MCFG_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(thief)
- MDRV_VIDEO_UPDATE(thief)
+ MCFG_VIDEO_START(thief)
+ MCFG_VIDEO_UPDATE(thief)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 4000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, 4000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 4000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 4000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(thief_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(thief_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( natodef, thief_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(thief_main_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", thief_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(thief_main_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", thief_interrupt)
/* 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, 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf)
+ MCFG_TMS9927_ADD("tms", MASTER_CLOCK/4, tms9927_intf)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(thief)
- MDRV_VIDEO_UPDATE(thief)
+ MCFG_VIDEO_START(thief)
+ MCFG_VIDEO_UPDATE(thief)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 4000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, 4000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, 4000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, 4000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(natodef_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(natodef_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/**********************************************************/
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index e4da8a6648f..676c9e1374f 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -189,29 +189,29 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( thoop2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(thoop2_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(thoop2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
- MDRV_GFXDECODE(thoop2)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(thoop2)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(thoop2)
- MDRV_VIDEO_UPDATE(thoop2)
+ MCFG_VIDEO_START(thoop2)
+ MCFG_VIDEO_UPDATE(thoop2)
/* 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/thunderj.c b/src/mame/drivers/thunderj.c
index 06a108cafcc..49546e0c270 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -286,35 +286,35 @@ GFXDECODE_END
static MACHINE_CONFIG_START( thunderj, thunderj_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(extra_map)
+ MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(extra_map)
- MDRV_MACHINE_START(thunderj)
- MDRV_MACHINE_RESET(thunderj)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(thunderj)
+ MCFG_MACHINE_RESET(thunderj)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* perfect synchronization due to shared RAM */
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(thunderj)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(thunderj)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a VAD chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(thunderj)
- MDRV_VIDEO_UPDATE(thunderj)
+ MCFG_VIDEO_START(thunderj)
+ MCFG_VIDEO_UPDATE(thunderj)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_ii_mono)
+ MCFG_FRAGMENT_ADD(jsa_ii_mono)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index a44430ef45c..e767daca888 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -682,85 +682,85 @@ static MACHINE_RESET( thunderx )
static MACHINE_CONFIG_START( scontra, thunderx_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) /* Verified on pcb, CPU is 052001 */
- MDRV_CPU_PROGRAM_MAP(scontra_map)
- MDRV_CPU_VBLANK_INT("screen", scontra_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) /* Verified on pcb, CPU is 052001 */
+ MCFG_CPU_PROGRAM_MAP(scontra_map)
+ MCFG_CPU_VBLANK_INT("screen", scontra_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(scontra_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(scontra_sound_map)
- MDRV_MACHINE_START(scontra)
- MDRV_MACHINE_RESET(scontra)
+ MCFG_MACHINE_START(scontra)
+ MCFG_MACHINE_RESET(scontra)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.17) /* 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.17) /* 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(scontra)
- MDRV_VIDEO_UPDATE(scontra)
+ MCFG_VIDEO_START(scontra)
+ MCFG_VIDEO_UPDATE(scontra)
- MDRV_K052109_ADD("k052109", thunderx_k052109_intf)
- MDRV_K051960_ADD("k051960", thunderx_k051960_intf)
+ MCFG_K052109_ADD("k052109", thunderx_k052109_intf)
+ MCFG_K051960_ADD("k051960", thunderx_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( thunderx, thunderx_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(thunderx_map)
- MDRV_CPU_VBLANK_INT("screen", scontra_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(thunderx_map)
+ MCFG_CPU_VBLANK_INT("screen", scontra_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(thunderx_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* ? */
+ MCFG_CPU_PROGRAM_MAP(thunderx_sound_map)
- MDRV_MACHINE_START(thunderx)
- MDRV_MACHINE_RESET(thunderx)
+ MCFG_MACHINE_START(thunderx)
+ MCFG_MACHINE_RESET(thunderx)
/* 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(14*8, (64-14)*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(scontra)
- MDRV_VIDEO_UPDATE(scontra)
+ MCFG_VIDEO_START(scontra)
+ MCFG_VIDEO_UPDATE(scontra)
- MDRV_K052109_ADD("k052109", thunderx_k052109_intf)
- MDRV_K051960_ADD("k051960", thunderx_k051960_intf)
+ MCFG_K052109_ADD("k052109", thunderx_k052109_intf)
+ MCFG_K051960_ADD("k051960", thunderx_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index ad73e6acba0..c2291e825da 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -220,34 +220,34 @@ GFXDECODE_END
static MACHINE_CONFIG_START( tiamc1, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080,16000000/9) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(tiamc1_map)
- MDRV_CPU_IO_MAP(tiamc1_io_map)
+ MCFG_CPU_ADD("maincpu", I8080,16000000/9) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(tiamc1_map)
+ MCFG_CPU_IO_MAP(tiamc1_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_MACHINE_RESET(tiamc1)
+ MCFG_MACHINE_RESET(tiamc1)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1600))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1600))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 256-1)
- MDRV_GFXDECODE(tiamc1)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(tiamc1)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(tiamc1)
- MDRV_VIDEO_START(tiamc1)
- MDRV_VIDEO_UPDATE(tiamc1)
+ MCFG_PALETTE_INIT(tiamc1)
+ MCFG_VIDEO_START(tiamc1)
+ MCFG_VIDEO_UPDATE(tiamc1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("2x8253", TIAMC1, 16000000/9)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("2x8253", TIAMC1, 16000000/9)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 895ab5421de..168859a80ef 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -735,106 +735,106 @@ static const tms34010_config rapidfir_tms_config =
static MACHINE_CONFIG_START( tickee, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tickee_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(tickee_map)
- MDRV_MACHINE_RESET(tickee)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(tickee)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_TICKET_DISPENSER_ADD("ticket1", 100, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
- MDRV_TICKET_DISPENSER_ADD("ticket2", 100, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_TICKET_DISPENSER_ADD("ticket1", 100, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_TICKET_DISPENSER_ADD("ticket2", 100, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_START(tickee)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(tickee)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2149, VIDEO_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2149, VIDEO_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ym2", YM2149, VIDEO_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ym2", YM2149, VIDEO_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ghoshunt, tickee )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ghoshunt_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ghoshunt_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rapidfir, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, XTAL_50MHz)
- MDRV_CPU_CONFIG(rapidfir_tms_config)
- MDRV_CPU_PROGRAM_MAP(rapidfir_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_50MHz)
+ MCFG_CPU_CONFIG(rapidfir_tms_config)
+ MCFG_CPU_PROGRAM_MAP(rapidfir_map)
- MDRV_MACHINE_RESET(rapidfir)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(rapidfir)
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_START(tickee)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(tickee)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mouseatk, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(mouseatk_map)
+ MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(mouseatk_map)
- MDRV_MACHINE_RESET(tickee)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(tickee)
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_TICKET_DISPENSER_ADD("ticket1", 100, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
- MDRV_TICKET_DISPENSER_ADD("ticket2", 100, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_TICKET_DISPENSER_ADD("ticket1", 100, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_TICKET_DISPENSER_ADD("ticket2", 100, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym", YM2149, OKI_CLOCK)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ym", YM2149, OKI_CLOCK)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 901e4274c90..7f9348f290b 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -517,42 +517,42 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( tigeroad, tigeroad_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_port_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2203 */
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.08) /* verified on pcb */
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.08) /* verified on pcb */
+ 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)
- MDRV_GFXDECODE(tigeroad)
- MDRV_PALETTE_LENGTH(576)
+ MCFG_GFXDECODE(tigeroad)
+ MCFG_PALETTE_LENGTH(576)
- MDRV_VIDEO_START(tigeroad)
- MDRV_VIDEO_EOF(tigeroad)
- MDRV_VIDEO_UPDATE(tigeroad)
+ MCFG_VIDEO_START(tigeroad)
+ MCFG_VIDEO_EOF(tigeroad)
+ MCFG_VIDEO_UPDATE(tigeroad)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -561,15 +561,15 @@ static MACHINE_CONFIG_DERIVED( toramich, tigeroad )
/* basic machine hardware */
- MDRV_CPU_ADD("sample", Z80, 3579545) /* ? */
- MDRV_CPU_PROGRAM_MAP(sample_map)
- MDRV_CPU_IO_MAP(sample_port_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,4000) /* ? */
+ MCFG_CPU_ADD("sample", Z80, 3579545) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sample_map)
+ MCFG_CPU_IO_MAP(sample_port_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,4000) /* ? */
/* sound hardware */
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index 644cbd7b60a..4d44f7bd735 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -231,53 +231,53 @@ static INTERRUPT_GEN( timelimt_irq ) {
static MACHINE_CONFIG_START( timelimt, timelimt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5.000 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", timelimt_irq)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.000 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", timelimt_irq)
- MDRV_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* ? */
+ MCFG_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* ? */
- MDRV_QUANTUM_TIME(HZ(3000))
+ MCFG_QUANTUM_TIME(HZ(3000))
- MDRV_MACHINE_START(timelimt)
- MDRV_MACHINE_RESET(timelimt)
+ MCFG_MACHINE_START(timelimt)
+ MCFG_MACHINE_RESET(timelimt)
/* 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)
+ 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)
- MDRV_GFXDECODE(timelimt)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_GFXDECODE(timelimt)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(timelimt)
- MDRV_VIDEO_START(timelimt)
- MDRV_VIDEO_UPDATE(timelimt)
+ MCFG_PALETTE_INIT(timelimt)
+ MCFG_VIDEO_START(timelimt)
+ MCFG_VIDEO_UPDATE(timelimt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 18432000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 18432000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 18432000/12)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 18432000/12)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( progress, timelimt )
/* basic machine hardware */
- MDRV_GFXDECODE(progress)
- MDRV_PALETTE_LENGTH(96)
+ MCFG_GFXDECODE(progress)
+ MCFG_PALETTE_LENGTH(96)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index 25fa620a5ab..a907b0700b0 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -380,52 +380,52 @@ static MACHINE_RESET( timeplt )
static MACHINE_CONFIG_START( timeplt, timeplt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */
- MDRV_CPU_PROGRAM_MAP(timeplt_main_map)
- MDRV_CPU_VBLANK_INT("screen", timeplt_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */
+ MCFG_CPU_PROGRAM_MAP(timeplt_main_map)
+ MCFG_CPU_VBLANK_INT("screen", timeplt_interrupt)
- MDRV_MACHINE_START(timeplt)
- MDRV_MACHINE_RESET(timeplt)
+ MCFG_MACHINE_START(timeplt)
+ MCFG_MACHINE_RESET(timeplt)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ 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)
- MDRV_GFXDECODE(timeplt)
- MDRV_PALETTE_LENGTH(32*4+64*4)
+ MCFG_GFXDECODE(timeplt)
+ MCFG_PALETTE_LENGTH(32*4+64*4)
- MDRV_PALETTE_INIT(timeplt)
- MDRV_VIDEO_START(timeplt)
- MDRV_VIDEO_UPDATE(timeplt)
+ MCFG_PALETTE_INIT(timeplt)
+ MCFG_VIDEO_START(timeplt)
+ MCFG_VIDEO_UPDATE(timeplt)
/* sound hardware */
- MDRV_FRAGMENT_ADD(timeplt_sound)
+ MCFG_FRAGMENT_ADD(timeplt_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psurge, timeplt )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(psurge_main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(psurge_main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(0)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( chkun, timeplt )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(chkun_main_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(chkun_main_map)
- MDRV_VIDEO_START(chkun)
+ MCFG_VIDEO_START(chkun)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/timetrv.c b/src/mame/drivers/timetrv.c
index 6d6a514c1a0..2d83e49745d 100644
--- a/src/mame/drivers/timetrv.c
+++ b/src/mame/drivers/timetrv.c
@@ -128,23 +128,23 @@ static INTERRUPT_GEN( ld_irq )
static MACHINE_CONFIG_START( timetrv, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",I80188,20000000) //???
- MDRV_CPU_PROGRAM_MAP(timetrv_map)
- MDRV_CPU_IO_MAP(timetrv_io)
- MDRV_CPU_VBLANK_INT("screen",vblank_irq)
- MDRV_CPU_PERIODIC_INT(ld_irq,60) //remove from here
+ MCFG_CPU_ADD("maincpu",I80188,20000000) //???
+ MCFG_CPU_PROGRAM_MAP(timetrv_map)
+ MCFG_CPU_IO_MAP(timetrv_io)
+ MCFG_CPU_VBLANK_INT("screen",vblank_irq)
+ MCFG_CPU_PERIODIC_INT(ld_irq,60) //remove from here
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1)
- MDRV_PALETTE_LENGTH(512)
-
- MDRV_VIDEO_START(timetrv)
- MDRV_VIDEO_UPDATE(timetrv)
+ 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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 512-1)
+ MCFG_PALETTE_LENGTH(512)
+
+ MCFG_VIDEO_START(timetrv)
+ MCFG_VIDEO_UPDATE(timetrv)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 627f303f644..d9f99bb2dc1 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -872,40 +872,40 @@ static const duart68681_config tmaster_duart68681_config =
};
static MACHINE_CONFIG_START( tm3k, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12MHz */
- MDRV_CPU_PROGRAM_MAP(tmaster_map)
- MDRV_CPU_VBLANK_INT_HACK(tm3k_interrupt,2+20) // ??
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12MHz */
+ MCFG_CPU_PROGRAM_MAP(tmaster_map)
+ MCFG_CPU_VBLANK_INT_HACK(tm3k_interrupt,2+20) // ??
- MDRV_MACHINE_START(tmaster)
- MDRV_MACHINE_RESET(tmaster)
+ MCFG_MACHINE_START(tmaster)
+ MCFG_MACHINE_RESET(tmaster)
- MDRV_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2 /*??*/, tmaster_duart68681_config )
+ MCFG_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2 /*??*/, tmaster_duart68681_config )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- 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(400, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 400-1, 0, 256-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(400, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 256-1)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(tmaster)
- MDRV_VIDEO_UPDATE(tmaster)
+ MCFG_VIDEO_START(tmaster)
+ MCFG_VIDEO_UPDATE(tmaster)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_32MHz / 16, OKIM6295_PIN7_HIGH) /* 2MHz; clock frequency & pin 7 not verified */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz / 16, OKIM6295_PIN7_HIGH) /* 2MHz; clock frequency & pin 7 not verified */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tm, tm3k )
- MDRV_OKIM6295_REPLACE("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_REPLACE("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -938,37 +938,37 @@ static MACHINE_RESET( galgames )
}
static MACHINE_CONFIG_START( galgames, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
- MDRV_CPU_PROGRAM_MAP(galgames_map)
- MDRV_CPU_VBLANK_INT_HACK(galgames_interrupt, 1+20) // ??
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(galgames_map)
+ MCFG_CPU_VBLANK_INT_HACK(galgames_interrupt, 1+20) // ??
// 5 EEPROMs on the motherboard (for BIOS + 4 Carts)
- MDRV_EEPROM_ADD(GALGAMES_EEPROM_BIOS, galgames_eeprom_interface)
- MDRV_EEPROM_ADD(GALGAMES_EEPROM_CART1, galgames_eeprom_interface)
- MDRV_EEPROM_ADD(GALGAMES_EEPROM_CART2, galgames_eeprom_interface)
- MDRV_EEPROM_ADD(GALGAMES_EEPROM_CART3, galgames_eeprom_interface)
- MDRV_EEPROM_ADD(GALGAMES_EEPROM_CART4, galgames_eeprom_interface)
+ MCFG_EEPROM_ADD(GALGAMES_EEPROM_BIOS, galgames_eeprom_interface)
+ MCFG_EEPROM_ADD(GALGAMES_EEPROM_CART1, galgames_eeprom_interface)
+ MCFG_EEPROM_ADD(GALGAMES_EEPROM_CART2, galgames_eeprom_interface)
+ MCFG_EEPROM_ADD(GALGAMES_EEPROM_CART3, galgames_eeprom_interface)
+ MCFG_EEPROM_ADD(GALGAMES_EEPROM_CART4, galgames_eeprom_interface)
- MDRV_MACHINE_RESET( galgames )
+ MCFG_MACHINE_RESET( galgames )
/* video hardware */
- 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(400, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 400-1, 0, 256-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(400, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 256-1)
- MDRV_PALETTE_LENGTH(0x1000) // only 0x100 used
+ MCFG_PALETTE_LENGTH(0x1000) // only 0x100 used
- MDRV_VIDEO_START(galgames)
- MDRV_VIDEO_UPDATE(tmaster)
+ MCFG_VIDEO_START(galgames)
+ MCFG_VIDEO_UPDATE(tmaster)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_24MHz / 8, OKIM6295_PIN7_LOW) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz / 8, OKIM6295_PIN7_LOW) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/*
@@ -978,7 +978,7 @@ MACHINE_CONFIG_END
fffe f2f7 8557 c119 0000 0000 2340 188e
*/
static MACHINE_CONFIG_DERIVED( galgame2, galgames )
-// MDRV_CPU_ADD("pic", PIC12C508, XTAL_24MHz / 2)
+// MCFG_CPU_ADD("pic", PIC12C508, XTAL_24MHz / 2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c
index a1eb526550c..227bdee413b 100644
--- a/src/mame/drivers/tmmjprd.c
+++ b/src/mame/drivers/tmmjprd.c
@@ -715,47 +715,47 @@ static INTERRUPT_GEN( tmmjprd_interrupt )
}
static MACHINE_CONFIG_START( tmmjprd, driver_device )
- MDRV_CPU_ADD("maincpu",M68EC020,24000000) /* 24 MHz */
- MDRV_CPU_PROGRAM_MAP(tmmjprd_map)
- MDRV_CPU_VBLANK_INT_HACK(tmmjprd_interrupt,2)
- MDRV_EEPROM_93C46_ADD("eeprom")
-
- MDRV_GFXDECODE(tmmjprd)
-
-// 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*16, 64*16)
-// MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_PALETTE_LENGTH(0x1000)
-
-
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(64*16, 64*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- //MDRV_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*8, 64*16-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(64*16, 64*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- //MDRV_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*8, 64*16-1)
-
-
- MDRV_VIDEO_START(tmmjprd)
- MDRV_VIDEO_UPDATE(tmmjprd)
+ MCFG_CPU_ADD("maincpu",M68EC020,24000000) /* 24 MHz */
+ MCFG_CPU_PROGRAM_MAP(tmmjprd_map)
+ MCFG_CPU_VBLANK_INT_HACK(tmmjprd_interrupt,2)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+
+ MCFG_GFXDECODE(tmmjprd)
+
+// 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*16, 64*16)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_PALETTE_LENGTH(0x1000)
+
+
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(64*16, 64*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ //MCFG_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*8, 64*16-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(64*16, 64*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ //MCFG_SCREEN_VISIBLE_AREA(0*8, 64*16-1, 0*8, 64*16-1)
+
+
+ MCFG_VIDEO_START(tmmjprd)
+ MCFG_VIDEO_UPDATE(tmmjprd)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tmpdoki, tmmjprd )
- MDRV_DEFAULT_LAYOUT(layout_horizont)
+ MCFG_DEFAULT_LAYOUT(layout_horizont)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 68dd8d0dd2c..03272867c03 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -2274,84 +2274,84 @@ static MACHINE_RESET( common )
static MACHINE_CONFIG_START( cuebrick, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz */
- MDRV_CPU_PROGRAM_MAP(cuebrick_main_map)
- MDRV_CPU_VBLANK_INT_HACK(cuebrick_interrupt,10)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz */
+ MCFG_CPU_PROGRAM_MAP(cuebrick_main_map)
+ MCFG_CPU_VBLANK_INT_HACK(cuebrick_interrupt,10)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
+ 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_VIDEO_START(cuebrick)
- MDRV_VIDEO_UPDATE(mia)
+ MCFG_VIDEO_START(cuebrick)
+ MCFG_VIDEO_UPDATE(mia)
- MDRV_K052109_ADD("k052109", cuebrick_k052109_intf)
- MDRV_K051960_ADD("k051960", cuebrick_k051960_intf)
+ MCFG_K052109_ADD("k052109", cuebrick_k052109_intf)
+ MCFG_K051960_ADD("k051960", cuebrick_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_CONFIG(ym2151_interface_cbj)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_CONFIG(ym2151_interface_cbj)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mia, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
- MDRV_CPU_PROGRAM_MAP(mia_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
+ MCFG_CPU_PROGRAM_MAP(mia_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(mia_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(mia_audio_map)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
- 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
+ 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(mia)
- MDRV_VIDEO_UPDATE(mia)
+ MCFG_VIDEO_START(mia)
+ MCFG_VIDEO_UPDATE(mia)
- MDRV_K052109_ADD("k052109", mia_k052109_intf)
- MDRV_K051960_ADD("k051960", mia_k051960_intf)
+ MCFG_K052109_ADD("k052109", mia_k052109_intf)
+ MCFG_K051960_ADD("k051960", mia_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
@@ -2367,191 +2367,191 @@ static MACHINE_RESET( tmnt )
static MACHINE_CONFIG_START( tmnt, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
- MDRV_CPU_PROGRAM_MAP(tmnt_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq5_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
+ MCFG_CPU_PROGRAM_MAP(tmnt_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq5_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(tmnt_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(tmnt_audio_map)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(tmnt)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(tmnt)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
- 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
+ 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(tmnt)
- MDRV_VIDEO_UPDATE(tmnt)
+ MCFG_VIDEO_START(tmnt)
+ MCFG_VIDEO_UPDATE(tmnt)
- MDRV_K052109_ADD("k052109", tmnt_k052109_intf)
- MDRV_K051960_ADD("k051960", tmnt_k051960_intf)
+ MCFG_K052109_ADD("k052109", tmnt_k052109_intf)
+ MCFG_K051960_ADD("k051960", tmnt_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.33)
- MDRV_SOUND_ROUTE(1, "mono", 0.33)
+ MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.33)
+ MCFG_SOUND_ROUTE(1, "mono", 0.33)
- MDRV_SOUND_ADD("upd", UPD7759, XTAL_640kHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("upd", UPD7759, XTAL_640kHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(tmnt_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(tmnt_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( punkshot, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
- MDRV_CPU_PROGRAM_MAP(punkshot_main_map)
- MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_PROGRAM_MAP(punkshot_main_map)
+ MCFG_CPU_VBLANK_INT("screen", punkshot_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(punkshot_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(punkshot_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(punkshot)
+ MCFG_VIDEO_UPDATE(punkshot)
- MDRV_K052109_ADD("k052109", tmnt_k052109_intf)
- MDRV_K051960_ADD("k051960", punkshot_k051960_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", tmnt_k052109_intf)
+ MCFG_K051960_ADD("k051960", punkshot_k051960_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( lgtnfght, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
- MDRV_CPU_PROGRAM_MAP(lgtnfght_main_map)
- MDRV_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
+ MCFG_CPU_PROGRAM_MAP(lgtnfght_main_map)
+ MCFG_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(lgtnfght_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(lgtnfght_audio_map)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(lgtnfght)
- MDRV_VIDEO_UPDATE(lgtnfght)
+ MCFG_VIDEO_START(lgtnfght)
+ MCFG_VIDEO_UPDATE(lgtnfght)
- MDRV_K052109_ADD("k052109", tmnt_k052109_intf)
- MDRV_K053245_ADD("k053245", lgtnfght_k05324x_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", tmnt_k052109_intf)
+ MCFG_K053245_ADD("k053245", lgtnfght_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.70)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.70)
+ MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( blswhstl, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(blswhstl_main_map)
- MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(blswhstl_main_map)
+ MCFG_CPU_VBLANK_INT("screen", punkshot_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START( blswhstl )
- MDRV_VIDEO_UPDATE(lgtnfght)
- MDRV_VIDEO_EOF( blswhstl )
+ MCFG_VIDEO_START( blswhstl )
+ MCFG_VIDEO_UPDATE(lgtnfght)
+ MCFG_VIDEO_EOF( blswhstl )
- MDRV_K052109_ADD("k052109", blswhstl_k052109_intf)
- MDRV_K053245_ADD("k053245", blswhstl_k05324x_intf)
- MDRV_K053251_ADD("k053251")
- MDRV_K054000_ADD("k054000")
+ MCFG_K052109_ADD("k052109", blswhstl_k052109_intf)
+ MCFG_K053245_ADD("k053245", blswhstl_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
+ MCFG_K054000_ADD("k054000")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.70)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.70)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
- MDRV_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.50) /* fixed inverted stereo channels */
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.50) /* fixed inverted stereo channels */
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
MACHINE_CONFIG_END
@@ -2575,44 +2575,44 @@ GFXDECODE_END
static MACHINE_CONFIG_START( glfgreat, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
- MDRV_CPU_PROGRAM_MAP(glfgreat_main_map)
- MDRV_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
+ MCFG_CPU_PROGRAM_MAP(glfgreat_main_map)
+ MCFG_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(glfgreat_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(glfgreat_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(glfgreat)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(glfgreat)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(glfgreat)
- MDRV_VIDEO_UPDATE(glfgreat)
+ MCFG_VIDEO_START(glfgreat)
+ MCFG_VIDEO_UPDATE(glfgreat)
- MDRV_K052109_ADD("k052109", glfgreat_k052109_intf)
- MDRV_K053245_ADD("k053245", glfgreat_k05324x_intf)
- MDRV_K053936_ADD("k053936", glfgreat_k053936_interface)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", glfgreat_k052109_intf)
+ MCFG_K053245_ADD("k053245", glfgreat_k05324x_intf)
+ MCFG_K053936_ADD("k053936", glfgreat_k053936_interface)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2639,233 +2639,233 @@ static MACHINE_START( prmrsocr )
static MACHINE_CONFIG_START( prmrsocr, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
- MDRV_CPU_PROGRAM_MAP(prmrsocr_main_map)
- MDRV_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
+ MCFG_CPU_PROGRAM_MAP(prmrsocr_main_map)
+ MCFG_CPU_VBLANK_INT("screen", lgtnfght_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(prmrsocr_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(prmrsocr_audio_map)
/* NMIs are generated by the 054539 */
- MDRV_MACHINE_START(prmrsocr)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(prmrsocr)
+ MCFG_MACHINE_RESET(common)
- MDRV_EEPROM_ADD("eeprom", thndrx2_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", thndrx2_eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(glfgreat)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(glfgreat)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(prmrsocr)
- MDRV_VIDEO_UPDATE(glfgreat)
+ MCFG_VIDEO_START(prmrsocr)
+ MCFG_VIDEO_UPDATE(glfgreat)
- MDRV_K052109_ADD("k052109", glfgreat_k052109_intf)
- MDRV_K053245_ADD("k053245", prmrsocr_k05324x_intf)
- MDRV_K053936_ADD("k053936", prmrsocr_k053936_interface)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", glfgreat_k052109_intf)
+ MCFG_K053245_ADD("k053245", prmrsocr_k05324x_intf)
+ MCFG_K053936_ADD("k053936", prmrsocr_k053936_interface)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("k054539", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("k054539", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tmnt2, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
- MDRV_CPU_PROGRAM_MAP(tmnt2_main_map)
- MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_PROGRAM_MAP(tmnt2_main_map)
+ MCFG_CPU_VBLANK_INT("screen", punkshot_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 8000000) /* 8 MHz; clock is correct, but there's 1 cycle wait for ROM/RAM */
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* 8 MHz; clock is correct, but there's 1 cycle wait for ROM/RAM */
/* access. Access speed of ROM/RAM used on the machine is 150ns, */
/* without the wait, they cannot run on 8MHz. */
/* We are not emulating the wait state, so the ROM test ends at */
/* 02 instead of 00. */
- MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
+ MCFG_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
+ 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(lgtnfght)
- MDRV_VIDEO_UPDATE(tmnt2)
+ MCFG_VIDEO_START(lgtnfght)
+ MCFG_VIDEO_UPDATE(tmnt2)
- MDRV_K052109_ADD("k052109", tmnt_k052109_intf)
- MDRV_K053245_ADD("k053245", lgtnfght_k05324x_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", tmnt_k052109_intf)
+ MCFG_K053245_ADD("k053245", lgtnfght_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ssriders, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
- MDRV_CPU_PROGRAM_MAP(ssriders_main_map)
- MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
+ MCFG_CPU_PROGRAM_MAP(ssriders_main_map)
+ MCFG_CPU_VBLANK_INT("screen", punkshot_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ????? makes the ROM test sync */
- MDRV_CPU_PROGRAM_MAP(ssriders_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ????? makes the ROM test sync */
+ MCFG_CPU_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(lgtnfght)
- MDRV_VIDEO_UPDATE(tmnt2)
+ MCFG_VIDEO_START(lgtnfght)
+ MCFG_VIDEO_UPDATE(tmnt2)
- MDRV_K052109_ADD("k052109", tmnt_k052109_intf)
- MDRV_K053245_ADD("k053245", lgtnfght_k05324x_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", tmnt_k052109_intf)
+ MCFG_K053245_ADD("k053245", lgtnfght_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.70)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.70)
+ MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sunsetbl, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(sunsetbl_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(sunsetbl_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_K052109_ADD("k052109", sunsetbl_k052109_intf)
- MDRV_K053245_ADD("k053245", lgtnfght_k05324x_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", sunsetbl_k052109_intf)
+ MCFG_K053245_ADD("k053245", lgtnfght_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
- MDRV_VIDEO_UPDATE(tmnt2)
+ MCFG_VIDEO_UPDATE(tmnt2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1056000, 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("oki", 1056000, 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
static MACHINE_CONFIG_START( thndrx2, tmnt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MDRV_CPU_PROGRAM_MAP(thndrx2_main_map)
- MDRV_CPU_VBLANK_INT("screen", punkshot_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_CPU_PROGRAM_MAP(thndrx2_main_map)
+ MCFG_CPU_VBLANK_INT("screen", punkshot_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(thndrx2_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(thndrx2_audio_map)
/* NMIs are generated by the 053260 */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
- MDRV_EEPROM_ADD("eeprom", thndrx2_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", thndrx2_eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS)
- 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(thndrx2)
+ MCFG_VIDEO_UPDATE(thndrx2)
- MDRV_K052109_ADD("k052109", tmnt_k052109_intf)
- MDRV_K051960_ADD("k051960", thndrx2_k051960_intf)
- MDRV_K053251_ADD("k053251")
- MDRV_K054000_ADD("k054000")
+ MCFG_K052109_ADD("k052109", tmnt_k052109_intf)
+ MCFG_K051960_ADD("k051960", thndrx2_k051960_intf)
+ MCFG_K053251_ADD("k053251")
+ MCFG_K054000_ADD("k054000")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("k053260", K053260, XTAL_3_579545MHz)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index d1a44ba3bee..36c68eaea4f 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1610,312 +1610,312 @@ static const samples_interface tnzs_samples_interface =
static MACHINE_CONFIG_START( arknoid2, tnzs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", arknoid2_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", arknoid2_interrupt)
- MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(tnzs)
- MDRV_MACHINE_RESET(tnzs)
+ MCFG_MACHINE_START(tnzs)
+ MCFG_MACHINE_RESET(tnzs)
/* 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)
+ 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)
- MDRV_GFXDECODE(tnzs)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(tnzs)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(arknoid2)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_PALETTE_INIT(arknoid2)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( drtoppel, tnzs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", arknoid2_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", arknoid2_interrupt)
- MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(tnzs)
- MDRV_MACHINE_RESET(tnzs)
+ MCFG_MACHINE_START(tnzs)
+ MCFG_MACHINE_RESET(tnzs)
/* 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)
+ 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)
- MDRV_GFXDECODE(tnzs)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(tnzs)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(arknoid2)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_PALETTE_INIT(arknoid2)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tnzs, tnzs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mcu", I8742 ,12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */
- MDRV_CPU_IO_MAP(i8742_io_map)
+ MCFG_CPU_ADD("mcu", I8742 ,12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */
+ MCFG_CPU_IO_MAP(i8742_io_map)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(tnzs)
- MDRV_MACHINE_RESET(tnzs)
+ MCFG_MACHINE_START(tnzs)
+ MCFG_MACHINE_RESET(tnzs)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.15) /* it should be the same as the newer pcb vsync */
- 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(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.15) /* it should be the same as the newer pcb vsync */
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(tnzs)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(tnzs)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( insectx, tnzs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(tnzs)
- MDRV_MACHINE_RESET(tnzs)
+ MCFG_MACHINE_START(tnzs)
+ MCFG_MACHINE_RESET(tnzs)
/* 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)
+ 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)
- MDRV_GFXDECODE(insectx)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(insectx)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kageki, tnzs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(kageki_sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(kageki_sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(tnzs)
- MDRV_MACHINE_RESET(tnzs)
+ MCFG_MACHINE_START(tnzs)
+ MCFG_MACHINE_RESET(tnzs)
/* 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)
+ 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)
- MDRV_GFXDECODE(tnzs)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(tnzs)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(kageki_ym2203_interface)
- 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.35)
-
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(tnzs_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(kageki_ym2203_interface)
+ 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.35)
+
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(tnzs_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tnzsb, tnzs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu0_type2)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu0_type2)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnzsb_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tnzsb_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tnzsb_cpu2_map)
- MDRV_CPU_IO_MAP(tnzsb_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tnzsb_cpu2_map)
+ MCFG_CPU_IO_MAP(tnzsb_io_map)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(tnzs)
- MDRV_MACHINE_RESET(tnzs)
+ MCFG_MACHINE_START(tnzs)
+ MCFG_MACHINE_RESET(tnzs)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.15) /* verified on pcb */
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.15) /* verified on pcb */
+ 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)
- MDRV_GFXDECODE(tnzs)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(tnzs)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2203b_interface)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_SOUND_ROUTE(3, "mono", 2.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2203b_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ROUTE(3, "mono", 2.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( kabukiz, tnzsb )
/* basic machine hardware */
- MDRV_CPU_MODIFY("sub")
- MDRV_CPU_PROGRAM_MAP(kabukiz_cpu1_map)
+ MCFG_CPU_MODIFY("sub")
+ MCFG_CPU_PROGRAM_MAP(kabukiz_cpu1_map)
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(kabukiz_cpu2_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(kabukiz_cpu2_map)
- MDRV_SOUND_MODIFY("ymsnd")
- MDRV_SOUND_CONFIG(kabukiz_ym2203_interface)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
- MDRV_SOUND_ROUTE(3, "mono", 2.0)
+ MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_SOUND_CONFIG(kabukiz_ym2203_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ROUTE(3, "mono", 2.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
static MACHINE_CONFIG_START( jpopnics, tnzs_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(jpopnics_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */
+ MCFG_CPU_PROGRAM_MAP(jpopnics_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */
- MDRV_CPU_PROGRAM_MAP(jpopnics_sub_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */
+ MCFG_CPU_PROGRAM_MAP(jpopnics_sub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MDRV_MACHINE_START(jpopnics)
- MDRV_MACHINE_RESET(jpopnics)
+ MCFG_MACHINE_START(jpopnics)
+ MCFG_MACHINE_RESET(jpopnics)
/* 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)
+ 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)
- MDRV_GFXDECODE(tnzs)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tnzs)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_UPDATE(tnzs)
- MDRV_VIDEO_EOF(tnzs)
+ MCFG_VIDEO_UPDATE(tnzs)
+ MCFG_VIDEO_EOF(tnzs)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_12MHz/4) /* Not verified - Main board Crystal is 12MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_12MHz/4) /* Not verified - Main board Crystal is 12MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index fa57a229975..40d07fab148 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1513,320 +1513,320 @@ static const ym3812_interface ym3812_config =
static MACHINE_CONFIG_START( rallybik, toaplan1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz)
- MDRV_CPU_PROGRAM_MAP(rallybik_main_map)
- MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_PROGRAM_MAP(rallybik_main_map)
+ MCFG_CPU_VBLANK_INT("screen", toaplan1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MDRV_CPU_IO_MAP(rallybik_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_CPU_IO_MAP(rallybik_sound_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(toaplan1)
+ MCFG_MACHINE_RESET(toaplan1)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55.14) /* verified on pcb */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512) /* 512x288 active */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55.14) /* verified on pcb */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512) /* 512x288 active */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(rallybik)
- MDRV_PALETTE_LENGTH((64*16)+(64*16))
+ MCFG_GFXDECODE(rallybik)
+ MCFG_PALETTE_LENGTH((64*16)+(64*16))
- MDRV_VIDEO_START(rallybik)
- MDRV_VIDEO_EOF(rallybik)
- MDRV_VIDEO_UPDATE(rallybik)
+ MCFG_VIDEO_START(rallybik)
+ MCFG_VIDEO_EOF(rallybik)
+ MCFG_VIDEO_UPDATE(rallybik)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( truxton, toaplan1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz)
- MDRV_CPU_PROGRAM_MAP(truxton_main_map)
- MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_PROGRAM_MAP(truxton_main_map)
+ MCFG_CPU_VBLANK_INT("screen", toaplan1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MDRV_CPU_IO_MAP(truxton_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_CPU_IO_MAP(truxton_sound_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(toaplan1)
+ MCFG_MACHINE_RESET(toaplan1)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.59) /* verified on pcb */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512) /* 512x320 active */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.59) /* verified on pcb */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512) /* 512x320 active */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan1)
- MDRV_PALETTE_LENGTH((64*16)+(64*16))
+ MCFG_GFXDECODE(toaplan1)
+ MCFG_PALETTE_LENGTH((64*16)+(64*16))
- MDRV_VIDEO_START(toaplan1)
- MDRV_VIDEO_EOF(toaplan1)
- MDRV_VIDEO_UPDATE(toaplan1)
+ MCFG_VIDEO_START(toaplan1)
+ MCFG_VIDEO_EOF(toaplan1)
+ MCFG_VIDEO_UPDATE(toaplan1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hellfire, toaplan1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz)
- MDRV_CPU_PROGRAM_MAP(hellfire_main_map)
- MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_PROGRAM_MAP(hellfire_main_map)
+ MCFG_CPU_VBLANK_INT("screen", toaplan1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MDRV_CPU_IO_MAP(hellfire_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_CPU_IO_MAP(hellfire_sound_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(toaplan1)
+ MCFG_MACHINE_RESET(toaplan1)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512) /* 512x240 active */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 16, 255)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512) /* 512x240 active */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 16, 255)
- MDRV_GFXDECODE(toaplan1)
- MDRV_PALETTE_LENGTH((64*16)+(64*16))
+ MCFG_GFXDECODE(toaplan1)
+ MCFG_PALETTE_LENGTH((64*16)+(64*16))
- MDRV_VIDEO_START(toaplan1)
- MDRV_VIDEO_EOF(toaplan1)
- MDRV_VIDEO_UPDATE(toaplan1)
+ MCFG_VIDEO_START(toaplan1)
+ MCFG_VIDEO_EOF(toaplan1)
+ MCFG_VIDEO_UPDATE(toaplan1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( zerowing, toaplan1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz)
- MDRV_CPU_PROGRAM_MAP(zerowing_main_map)
- MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_PROGRAM_MAP(zerowing_main_map)
+ MCFG_CPU_VBLANK_INT("screen", toaplan1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MDRV_CPU_IO_MAP(zerowing_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_CPU_IO_MAP(zerowing_sound_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(zerowing)
+ MCFG_MACHINE_RESET(zerowing)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (XTAL_28MHz / 4) / (450 * 282) ) /* fixed by SUZ */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512) /* 512x240 mostly active, 512x512 actually used */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 16, 255)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (XTAL_28MHz / 4) / (450 * 282) ) /* fixed by SUZ */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512) /* 512x240 mostly active, 512x512 actually used */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 16, 255)
- MDRV_GFXDECODE(toaplan1)
- MDRV_PALETTE_LENGTH((64*16)+(64*16))
+ MCFG_GFXDECODE(toaplan1)
+ MCFG_PALETTE_LENGTH((64*16)+(64*16))
- MDRV_VIDEO_START(toaplan1)
- MDRV_VIDEO_EOF(toaplan1)
- MDRV_VIDEO_UPDATE(toaplan1)
+ MCFG_VIDEO_START(toaplan1)
+ MCFG_VIDEO_EOF(toaplan1)
+ MCFG_VIDEO_UPDATE(toaplan1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( demonwld, toaplan1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz)
- MDRV_CPU_PROGRAM_MAP(demonwld_main_map)
- MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_PROGRAM_MAP(demonwld_main_map)
+ MCFG_CPU_VBLANK_INT("screen", toaplan1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MDRV_CPU_IO_MAP(demonwld_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_CPU_IO_MAP(demonwld_sound_io_map)
- MDRV_CPU_ADD("dsp", TMS32010, XTAL_28MHz/2)
- MDRV_CPU_PROGRAM_MAP(DSP_program_map)
- MDRV_CPU_IO_MAP(DSP_io_map)
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL_28MHz/2)
+ MCFG_CPU_PROGRAM_MAP(DSP_program_map)
+ MCFG_CPU_IO_MAP(DSP_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(demonwld)
+ MCFG_MACHINE_RESET(demonwld)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55.14) /* verified on pcb */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512) /* 512x240 active */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 16, 255)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55.14) /* verified on pcb */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512) /* 512x240 active */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 16, 255)
- MDRV_GFXDECODE(toaplan1)
- MDRV_PALETTE_LENGTH((64*16)+(64*16))
+ MCFG_GFXDECODE(toaplan1)
+ MCFG_PALETTE_LENGTH((64*16)+(64*16))
- MDRV_VIDEO_START(toaplan1)
- MDRV_VIDEO_EOF(toaplan1)
- MDRV_VIDEO_UPDATE(toaplan1)
+ MCFG_VIDEO_START(toaplan1)
+ MCFG_VIDEO_EOF(toaplan1)
+ MCFG_VIDEO_UPDATE(toaplan1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( samesame, toaplan1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz)
- MDRV_CPU_PROGRAM_MAP(samesame_main_map)
- MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_PROGRAM_MAP(samesame_main_map)
+ MCFG_CPU_VBLANK_INT("screen", toaplan1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z180, XTAL_28MHz/8) /* HD647180XOFS6 CPU */
- MDRV_CPU_PROGRAM_MAP(hd647180_mem_map)
- MDRV_DEVICE_DISABLE() /* Internal code is not dumped */
+ MCFG_CPU_ADD("audiocpu", Z180, XTAL_28MHz/8) /* HD647180XOFS6 CPU */
+ MCFG_CPU_PROGRAM_MAP(hd647180_mem_map)
+ MCFG_DEVICE_DISABLE() /* Internal code is not dumped */
- MDRV_MACHINE_RESET(toaplan1)
+ MCFG_MACHINE_RESET(toaplan1)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512) /* 512x320 active */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512) /* 512x320 active */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan1)
- MDRV_PALETTE_LENGTH((64*16)+(64*16))
+ MCFG_GFXDECODE(toaplan1)
+ MCFG_PALETTE_LENGTH((64*16)+(64*16))
- MDRV_VIDEO_START(toaplan1)
- MDRV_VIDEO_EOF(samesame)
- MDRV_VIDEO_UPDATE(toaplan1)
+ MCFG_VIDEO_START(toaplan1)
+ MCFG_VIDEO_EOF(samesame)
+ MCFG_VIDEO_UPDATE(toaplan1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( outzone, toaplan1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz)
- MDRV_CPU_PROGRAM_MAP(outzone_main_map)
- MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
+ MCFG_CPU_PROGRAM_MAP(outzone_main_map)
+ MCFG_CPU_VBLANK_INT("screen", toaplan1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
- MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MDRV_CPU_IO_MAP(outzone_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8)
+ MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_CPU_IO_MAP(outzone_sound_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(zerowing)
+ MCFG_MACHINE_RESET(zerowing)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512) /* 512x256 active */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512) /* 512x256 active */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(outzone)
- MDRV_PALETTE_LENGTH((64*16)+(64*16))
+ MCFG_GFXDECODE(outzone)
+ MCFG_PALETTE_LENGTH((64*16)+(64*16))
- MDRV_VIDEO_START(toaplan1)
- MDRV_VIDEO_EOF(toaplan1)
- MDRV_VIDEO_UPDATE(toaplan1)
+ MCFG_VIDEO_START(toaplan1)
+ MCFG_VIDEO_EOF(toaplan1)
+ MCFG_VIDEO_UPDATE(toaplan1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( vimana, toaplan1_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(vimana_main_map)
- MDRV_CPU_VBLANK_INT("screen", toaplan1_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(vimana_main_map)
+ MCFG_CPU_VBLANK_INT("screen", toaplan1_interrupt)
- MDRV_CPU_ADD("audiocpu", Z180, XTAL_28MHz/8) /* HD647180XOFS6 CPU */
- MDRV_CPU_PROGRAM_MAP(hd647180_mem_map)
- MDRV_DEVICE_DISABLE() /* Internal code is not dumped */
+ MCFG_CPU_ADD("audiocpu", Z180, XTAL_28MHz/8) /* HD647180XOFS6 CPU */
+ MCFG_CPU_PROGRAM_MAP(hd647180_mem_map)
+ MCFG_DEVICE_DISABLE() /* Internal code is not dumped */
- MDRV_MACHINE_RESET(vimana)
+ MCFG_MACHINE_RESET(vimana)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57.59) /* verified on pcb */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512) /* 512x256 active */
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57.59) /* verified on pcb */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512) /* 512x256 active */
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(vm)
- MDRV_PALETTE_LENGTH((64*16)+(64*16))
+ MCFG_GFXDECODE(vm)
+ MCFG_PALETTE_LENGTH((64*16)+(64*16))
- MDRV_VIDEO_START(toaplan1)
- MDRV_VIDEO_EOF(toaplan1)
- MDRV_VIDEO_UPDATE(toaplan1)
+ MCFG_VIDEO_START(toaplan1)
+ MCFG_VIDEO_EOF(toaplan1)
+ MCFG_VIDEO_UPDATE(toaplan1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 5d6591f7ea4..7cf23231fed 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -3788,83 +3788,83 @@ static const ymz280b_interface ymz280b_config =
static MACHINE_CONFIG_START( tekipaki, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(tekipaki_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#ifdef USE_HD64x180
- MDRV_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
- MDRV_CPU_PROGRAM_MAP(hd647180_mem)
+ MCFG_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
+ MCFG_CPU_PROGRAM_MAP(hd647180_mem)
#endif
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ghox, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(ghox_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(ghox_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#ifdef USE_HD64x180
- MDRV_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
- MDRV_CPU_PROGRAM_MAP(hd647180_mem)
+ MCFG_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
+ MCFG_CPU_PROGRAM_MAP(hd647180_mem)
#endif
- MDRV_MACHINE_RESET(ghox)
+ MCFG_MACHINE_RESET(ghox)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* x = modified to match batsugun 'unencrypted' code */
@@ -3896,53 +3896,53 @@ static const nec_config ts002mach_config ={ ts002mach_decryption_table, };
static MACHINE_CONFIG_START( dogyuun, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_25MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(dogyuun_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_25MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(dogyuun_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", V25, XTAL_25MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_rambased_mem)
- MDRV_CPU_CONFIG(ts002mach_config)
+ MCFG_CPU_ADD("audiocpu", V25, XTAL_25MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */
+ MCFG_CPU_PROGRAM_MAP(V25_rambased_mem)
+ MCFG_CPU_CONFIG(ts002mach_config)
- MDRV_MACHINE_RESET(dogyuun)
+ MCFG_MACHINE_RESET(dogyuun)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
#ifdef DUAL_SCREEN_VDPS
- MDRV_SCREEN_ADD("screen2", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen2", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
#endif
- MDRV_GFXDECODE(2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
- MDRV_DEVICE_ADD_VDP1
+ MCFG_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP1
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(dogyuun)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(dogyuun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* x = modified to match batsugun 'unencrypted' code - '?' likewise, but not so sure about them
@@ -3997,244 +3997,244 @@ static MACHINE_RESET(kbash)
static MACHINE_CONFIG_START( kbash, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(kbash_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(kbash_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
/* ROM based v25 */
- MDRV_CPU_ADD("mcu", V25, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_kbash_mem)
- MDRV_CPU_IO_MAP(V25_kbash_port)
- MDRV_CPU_CONFIG(ts004dash_config)
+ MCFG_CPU_ADD("mcu", V25, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */
+ MCFG_CPU_PROGRAM_MAP(V25_kbash_mem)
+ MCFG_CPU_IO_MAP(V25_kbash_port)
+ MCFG_CPU_CONFIG(ts004dash_config)
- MDRV_MACHINE_RESET(kbash)
+ MCFG_MACHINE_RESET(kbash)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kbash2, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(kbash2_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(kbash2_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( truxton2, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(truxton2_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(truxton2_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(truxton2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(truxton2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(truxton2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(truxton2)
+ MCFG_VIDEO_START(truxton2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(truxton2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pipibibs, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pipibibs_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(pipibibs_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_27MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pipibibs_sound_z80_mem)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(pipibibs_sound_z80_mem)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( whoopee, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(tekipaki_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
#ifdef USE_HD64x180
- MDRV_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
- MDRV_CPU_PROGRAM_MAP(hd647180_mem)
+ MCFG_CPU_ADD("mcu", Z180, XTAL_10MHz) /* HD647180 CPU actually */
+ MCFG_CPU_PROGRAM_MAP(hd647180_mem)
#endif
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pipibibi_bootleg, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(pipibibi_bootleg_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(pipibibi_bootleg_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_27MHz/8) /* ??? 3.37MHz */
- MDRV_CPU_PROGRAM_MAP(pipibibs_sound_z80_mem)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_27MHz/8) /* ??? 3.37MHz */
+ MCFG_CPU_PROGRAM_MAP(pipibibs_sound_z80_mem)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* x = modified to match batsugun 'unencrypted' code - '?' likewise, but not so sure about them */
@@ -4267,81 +4267,81 @@ static const nec_config ts001turbo_config ={ ts001turbo_decryption_table, };
static MACHINE_CONFIG_START( fixeight, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(fixeight_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(fixeight_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", V25, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_rambased_mem)
- MDRV_CPU_CONFIG(ts001turbo_config)
- //MDRV_CPU_IO_MAP(V25_port)
+ MCFG_CPU_ADD("audiocpu", V25, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */
+ MCFG_CPU_PROGRAM_MAP(V25_rambased_mem)
+ MCFG_CPU_CONFIG(ts001turbo_config)
+ //MCFG_CPU_IO_MAP(V25_port)
- MDRV_MACHINE_RESET(batsugun)
-// MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(batsugun)
+// MCFG_MACHINE_RESET(toaplan2)
- // MDRV_NVRAM_HANDLER(fixeight) /* See 37B6 code */
+ // MCFG_NVRAM_HANDLER(fixeight) /* See 37B6 code */
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) /* 27MHz Oscillator */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(truxton2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(truxton2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(truxton2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(truxton2)
+ MCFG_VIDEO_START(truxton2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(truxton2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fixeighb, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(fixeighb_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(fixeighb_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(fixeighb)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(fixeighb)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(fixeighb)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(truxton2)
+ MCFG_VIDEO_START(fixeighb)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(truxton2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_14MHz/16, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_14MHz/16, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* according to the comments this chip has the same markings as the Batsugun chip,
@@ -4379,39 +4379,39 @@ static const nec_config ts007spy_vfive_config ={ ts007spy_vfive_decryption_table
static MACHINE_CONFIG_START( vfive, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(vfive_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(vfive_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", V25, XTAL_20MHz/2) /* Verified on pcb, NEC V25+ type Toaplan mark scratched out */
- MDRV_CPU_PROGRAM_MAP(V25_rambased_mem)
- MDRV_CPU_CONFIG(ts007spy_vfive_config)
+ MCFG_CPU_ADD("audiocpu", V25, XTAL_20MHz/2) /* Verified on pcb, NEC V25+ type Toaplan mark scratched out */
+ MCFG_CPU_PROGRAM_MAP(V25_rambased_mem)
+ MCFG_CPU_CONFIG(ts007spy_vfive_config)
- MDRV_MACHINE_RESET(vfive)
+ MCFG_MACHINE_RESET(vfive)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) /* verified on pcb */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) /* verified on pcb */
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_RESET(batsugun)
@@ -4471,323 +4471,323 @@ static const nmk112_interface batrider_nmk112_intf =
static MACHINE_CONFIG_START( batsugun, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(batsugun_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(batsugun_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", V25, XTAL_32MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */
- MDRV_CPU_PROGRAM_MAP(V25_rambased_mem)
- MDRV_CPU_CONFIG(ts007spy_config)
+ MCFG_CPU_ADD("audiocpu", V25, XTAL_32MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */
+ MCFG_CPU_PROGRAM_MAP(V25_rambased_mem)
+ MCFG_CPU_CONFIG(ts007spy_config)
- //MDRV_CPU_IO_MAP(V25_port)
+ //MCFG_CPU_IO_MAP(V25_port)
- MDRV_MACHINE_RESET(batsugun)
+ MCFG_MACHINE_RESET(batsugun)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
#ifdef DUAL_SCREEN_VDPS
- MDRV_SCREEN_ADD("screen2", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen2", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
#endif
- MDRV_GFXDECODE(2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
- MDRV_DEVICE_ADD_VDP1
+ MCFG_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP1
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(batsugun)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(batsugun)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_CONFIG(batsugun_ym2151_interface)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_CONFIG(batsugun_ym2151_interface)
- MDRV_OKIM6295_ADD("oki", XTAL_32MHz/8, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/8, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( snowbro2, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP(snowbro2_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP(snowbro2_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(toaplan2)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(toaplan2)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(toaplan2)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(toaplan2)
+ MCFG_VIDEO_START(toaplan2)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(toaplan2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_27MHz/10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_27MHz/10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( mahoudai, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(mahoudai_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(mahoudai_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(raizing)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(raizing)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(bgaregga)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(truxton2)
+ MCFG_VIDEO_START(bgaregga)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(truxton2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( shippumd, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(shippumd_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(shippumd_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(toaplan2)
+ MCFG_MACHINE_RESET(toaplan2)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_GFXDECODE(raizing)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(raizing)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_VIDEO_START(bgaregga)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(truxton2)
+ MCFG_VIDEO_START(bgaregga)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(truxton2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono",1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_27MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono",1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bgaregga, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(bgaregga_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(bgaregga_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq4)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET(bgaregga)
+ MCFG_MACHINE_RESET(bgaregga)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(raizing)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(raizing)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(bgaregga)
- MDRV_VIDEO_EOF(toaplan2)
- MDRV_VIDEO_UPDATE(truxton2)
+ MCFG_VIDEO_START(bgaregga)
+ MCFG_VIDEO_EOF(toaplan2)
+ MCFG_VIDEO_UPDATE(truxton2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_32MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_32MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", XTAL_32MHz/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_NMK112_ADD("nmk112", bgaregga_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", bgaregga_nmk112_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( batrider, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(batrider_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(batrider_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq2)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(batrider_sound_z80_mem)
- MDRV_CPU_IO_MAP(batrider_sound_z80_port)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(batrider_sound_z80_mem)
+ MCFG_CPU_IO_MAP(batrider_sound_z80_port)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(bgaregga)
+ MCFG_MACHINE_RESET(bgaregga)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(batrider)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(batrider)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(batrider)
- MDRV_VIDEO_UPDATE(batrider)
+ MCFG_VIDEO_START(batrider)
+ MCFG_VIDEO_UPDATE(batrider)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_32MHz/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_32MHz/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki1", XTAL_32MHz/10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", XTAL_32MHz/10, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/10, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_NMK112_ADD("nmk112", batrider_nmk112_intf)
+ MCFG_NMK112_ADD("nmk112", batrider_nmk112_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bbakraid, toaplan2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(bbakraid_68k_mem)
- MDRV_CPU_VBLANK_INT("screen", toaplan2_vblank_irq1)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(bbakraid_68k_mem)
+ MCFG_CPU_VBLANK_INT("screen", toaplan2_vblank_irq1)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_32MHz/6) /* 5.3333MHz , 32MHz Oscillator */
- MDRV_CPU_PROGRAM_MAP(bbakraid_sound_z80_mem)
- MDRV_CPU_IO_MAP(bbakraid_sound_z80_port)
- MDRV_CPU_PERIODIC_INT(bbakraid_snd_interrupt, 448)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/6) /* 5.3333MHz , 32MHz Oscillator */
+ MCFG_CPU_PROGRAM_MAP(bbakraid_sound_z80_mem)
+ MCFG_CPU_IO_MAP(bbakraid_sound_z80_port)
+ MCFG_CPU_PERIODIC_INT(bbakraid_snd_interrupt, 448)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(toaplan2)
- MDRV_EEPROM_ADD("eeprom", bbakraid_93C66_intf)
+ MCFG_MACHINE_RESET(toaplan2)
+ MCFG_EEPROM_ADD("eeprom", bbakraid_93C66_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(432, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(432, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_GFXDECODE(batrider)
- MDRV_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
+ MCFG_GFXDECODE(batrider)
+ MCFG_PALETTE_LENGTH(0x10000) // we encode priority with colour in the tilemaps, so need a larger palette
- MDRV_DEVICE_ADD_VDP0
+ MCFG_DEVICE_ADD_VDP0
- MDRV_VIDEO_START(batrider)
- MDRV_VIDEO_UPDATE(batrider)
+ MCFG_VIDEO_START(batrider)
+ MCFG_VIDEO_UPDATE(batrider)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
- MDRV_SOUND_CONFIG(ymz280b_config)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz)
+ MCFG_SOUND_CONFIG(ymz280b_config)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bbakradu, bbakraid )
- MDRV_DEVICE_REMOVE("eeprom")
- MDRV_EEPROM_ADD("eeprom", bbakraid_93C66_intf)
- MDRV_EEPROM_DATA(bbakraid_unlim_default, 512)
+ MCFG_DEVICE_REMOVE("eeprom")
+ MCFG_EEPROM_ADD("eeprom", bbakraid_93C66_intf)
+ MCFG_EEPROM_DATA(bbakraid_unlim_default, 512)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index a8caf689e7e..f7b5d97fdc0 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -416,29 +416,29 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( toki, toki_state ) /* KOYO 20.000MHz near the cpu */
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,XTAL_20MHz /2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(toki_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz /2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(toki_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verifed on pcb */
- MDRV_MACHINE_RESET(seibu_sound)
+ MCFG_MACHINE_RESET(seibu_sound)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.61) /* verified on pcb */
- 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) /* verified */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.61) /* verified on pcb */
+ 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) /* verified */
- MDRV_GFXDECODE(toki)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(toki)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(toki)
- MDRV_VIDEO_EOF(toki)
- MDRV_VIDEO_UPDATE(toki)
+ MCFG_VIDEO_START(toki)
+ MCFG_VIDEO_EOF(toki)
+ MCFG_VIDEO_UPDATE(toki)
/* sound hardware */
SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_14_31818MHz/4,XTAL_12MHz/12) /* verifed on pcb */
@@ -448,38 +448,38 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tokib, toki_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */
- MDRV_CPU_PROGRAM_MAP(tokib_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL (could be level1, same vector) */
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */
+ MCFG_CPU_PROGRAM_MAP(tokib_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL (could be level1, same vector) */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* verified with PCB */
- MDRV_CPU_PROGRAM_MAP(tokib_audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* verified with PCB */
+ MCFG_CPU_PROGRAM_MAP(tokib_audio_map)
/* 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_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) /* verified */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ 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) /* verified */
- MDRV_GFXDECODE(tokib)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tokib)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(toki)
- MDRV_VIDEO_EOF(tokib)
- MDRV_VIDEO_UPDATE(tokib)
+ MCFG_VIDEO_START(toki)
+ MCFG_VIDEO_EOF(tokib)
+ MCFG_VIDEO_UPDATE(tokib)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tokyocop.c b/src/mame/drivers/tokyocop.c
index 0573a355adb..aac4ae203ec 100644
--- a/src/mame/drivers/tokyocop.c
+++ b/src/mame/drivers/tokyocop.c
@@ -38,21 +38,21 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( tokyocop, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Pentium4? */
- MDRV_CPU_PROGRAM_MAP(tokyocop_map)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Pentium4? */
+ MCFG_CPU_PROGRAM_MAP(tokyocop_map)
/* video hardware */
- 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(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(tokyocop)
- MDRV_VIDEO_UPDATE(tokyocop)
+ MCFG_VIDEO_START(tokyocop)
+ MCFG_VIDEO_UPDATE(tokyocop)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c
index b441ec421ad..9613d7c1a92 100644
--- a/src/mame/drivers/tomcat.c
+++ b/src/mame/drivers/tomcat.c
@@ -366,52 +366,52 @@ static const riot6532_interface tomcat_riot6532_intf =
};
static MACHINE_CONFIG_START( tomcat, driver_device )
- MDRV_CPU_ADD("maincpu", M68010, XTAL_12MHz / 2)
- MDRV_CPU_PROGRAM_MAP(tomcat_map)
- MDRV_CPU_VBLANK_INT_HACK(irq1_line_assert, 5)
- //MDRV_CPU_PERIODIC_INT(irq1_line_assert, (double)XTAL_12MHz / 16 / 16 / 16 / 12)
+ MCFG_CPU_ADD("maincpu", M68010, XTAL_12MHz / 2)
+ MCFG_CPU_PROGRAM_MAP(tomcat_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq1_line_assert, 5)
+ //MCFG_CPU_PERIODIC_INT(irq1_line_assert, (double)XTAL_12MHz / 16 / 16 / 16 / 12)
- MDRV_CPU_ADD("dsp", TMS32010, XTAL_16MHz)
- MDRV_CPU_PROGRAM_MAP( dsp_map)
- MDRV_CPU_IO_MAP( dsp_io_map)
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL_16MHz)
+ MCFG_CPU_PROGRAM_MAP( dsp_map)
+ MCFG_CPU_IO_MAP( dsp_io_map)
- MDRV_CPU_ADD("soundcpu", M6502, XTAL_14_31818MHz / 8 )
- MDRV_DEVICE_DISABLE()
- MDRV_CPU_PROGRAM_MAP( sound_map)
+ MCFG_CPU_ADD("soundcpu", M6502, XTAL_14_31818MHz / 8 )
+ MCFG_DEVICE_DISABLE()
+ MCFG_CPU_PROGRAM_MAP( sound_map)
- MDRV_RIOT6532_ADD("riot", XTAL_14_31818MHz / 8, tomcat_riot6532_intf)
+ MCFG_RIOT6532_ADD("riot", XTAL_14_31818MHz / 8, tomcat_riot6532_intf)
- MDRV_QUANTUM_TIME(HZ(4000))
+ MCFG_QUANTUM_TIME(HZ(4000))
- MDRV_MACHINE_START(tomcat)
+ MCFG_MACHINE_START(tomcat)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_M48T02_ADD( "m48t02" )
+ MCFG_M48T02_ADD( "m48t02" )
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(40)
- //MDRV_SCREEN_REFRESH_RATE((double)XTAL_12MHz / 16 / 16 / 16 / 12 / 5 )
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 280, 0, 250)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(40)
+ //MCFG_SCREEN_REFRESH_RATE((double)XTAL_12MHz / 16 / 16 / 16 / 12 / 5 )
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 280, 0, 250)
- MDRV_VIDEO_START(avg_tomcat)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(avg_tomcat)
+ MCFG_VIDEO_UPDATE(vector)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("pokey1", POKEY, XTAL_14_31818MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("pokey1", POKEY, XTAL_14_31818MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
- MDRV_SOUND_ADD("pokey2", POKEY, XTAL_14_31818MHz / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
+ MCFG_SOUND_ADD("pokey2", POKEY, XTAL_14_31818MHz / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
- MDRV_SOUND_ADD("tms", TMS5220, 325000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("tms", TMS5220, 325000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_14_31818MHz / 4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_14_31818MHz / 4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MACHINE_CONFIG_END
GAME( 1985, tomcat, 0, tomcat, tomcat, 0, ROT0, "Atari", "TomCat (prototype)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index a82b4c443c5..e2788b72ae6 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -226,29 +226,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( toobin, toobin_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68010, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68010, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(toobin)
- MDRV_MACHINE_RESET(toobin)
- MDRV_NVRAM_ADD_1FILL("eeprom")
- MDRV_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_START(toobin)
+ MCFG_MACHINE_RESET(toobin)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
+ MCFG_WATCHDOG_VBLANK_INIT(8)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 640, 0, 512, 416, 0, 384)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 640, 0, 512, 416, 0, 384)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_GFXDECODE(toobin)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(toobin)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(toobin)
- MDRV_VIDEO_UPDATE(toobin)
+ MCFG_VIDEO_START(toobin)
+ MCFG_VIDEO_UPDATE(toobin)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_i_stereo_pokey)
+ MCFG_FRAGMENT_ADD(jsa_i_stereo_pokey)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index ca70419d1e0..2668d2b9dc0 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -696,51 +696,51 @@ static const tc0140syt_interface topspeed_tc0140syt_intf =
static MACHINE_CONFIG_START( topspeed, topspeed_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(topspeed_map)
- MDRV_CPU_VBLANK_INT("screen", topspeed_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(topspeed_map)
+ MCFG_CPU_VBLANK_INT("screen", topspeed_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_map)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(topspeed_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", topspeed_cpub_interrupt)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(topspeed_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", topspeed_cpub_interrupt)
- MDRV_MACHINE_START(topspeed)
- MDRV_MACHINE_RESET(topspeed)
+ MCFG_MACHINE_START(topspeed)
+ MCFG_MACHINE_RESET(topspeed)
- MDRV_TC0220IOC_ADD("tc0220ioc", topspeed_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", topspeed_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(topspeed)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(topspeed)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_UPDATE(topspeed)
+ MCFG_VIDEO_UPDATE(topspeed)
- MDRV_PC080SN_ADD("pc080sn_1", topspeed_pc080sn_intf)
- MDRV_PC080SN_ADD("pc080sn_2", topspeed_pc080sn_intf)
+ MCFG_PC080SN_ADD("pc080sn_1", topspeed_pc080sn_intf)
+ MCFG_PC080SN_ADD("pc080sn_2", topspeed_pc080sn_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_TC0140SYT_ADD("tc0140syt", topspeed_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", topspeed_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index 635a2795307..4881048fa79 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -397,37 +397,37 @@ static MACHINE_RESET( toratora )
static MACHINE_CONFIG_START( toratora, toratora_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800,500000) /* ?????? game speed is entirely controlled by this */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_PERIODIC_INT(toratora_timer,16) /* timer counting at 16 Hz */
+ MCFG_CPU_ADD("maincpu", M6800,500000) /* ?????? game speed is entirely controlled by this */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_PERIODIC_INT(toratora_timer,16) /* timer counting at 16 Hz */
- MDRV_PIA6821_ADD("pia_u1", pia_u1_intf)
- MDRV_PIA6821_ADD("pia_u2", pia_u2_intf)
- MDRV_PIA6821_ADD("pia_u3", pia_u3_intf)
+ MCFG_PIA6821_ADD("pia_u1", pia_u1_intf)
+ MCFG_PIA6821_ADD("pia_u2", pia_u2_intf)
+ MCFG_PIA6821_ADD("pia_u3", pia_u3_intf)
- MDRV_MACHINE_START(toratora)
- MDRV_MACHINE_RESET(toratora)
+ MCFG_MACHINE_START(toratora)
+ MCFG_MACHINE_RESET(toratora)
/* video hardware */
- MDRV_VIDEO_UPDATE(toratora)
+ MCFG_VIDEO_UPDATE(toratora)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0,256-1,8,248-1)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0,256-1,8,248-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76477, 0)
- MDRV_SOUND_CONFIG(sn76477_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76477, 0)
+ MCFG_SOUND_CONFIG(sn76477_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76477, 0)
- MDRV_SOUND_CONFIG(sn76477_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76477, 0)
+ MCFG_SOUND_CONFIG(sn76477_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index 4fd89695308..7ebdf9187b0 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -167,30 +167,30 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( tourtabl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 3) /* actually M6507 */
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 3) /* actually M6507 */
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(tourtabl)
+ MCFG_MACHINE_START(tourtabl)
- MDRV_RIOT6532_ADD("riot1", MASTER_CLOCK / 3, r6532_interface_0)
- MDRV_RIOT6532_ADD("riot2", MASTER_CLOCK / 3, r6532_interface_1)
+ MCFG_RIOT6532_ADD("riot1", MASTER_CLOCK / 3, r6532_interface_0)
+ MCFG_RIOT6532_ADD("riot2", MASTER_CLOCK / 3, r6532_interface_1)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS( MASTER_CLOCK, 228, 34, 34 + 160, 262, 46, 46 + 200 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS( MASTER_CLOCK, 228, 34, 34 + 160, 262, 46, 46 + 200 )
- MDRV_PALETTE_LENGTH(TIA_PALETTE_LENGTH)
- MDRV_PALETTE_INIT(tia_NTSC)
+ MCFG_PALETTE_LENGTH(TIA_PALETTE_LENGTH)
+ MCFG_PALETTE_INIT(tia_NTSC)
- MDRV_VIDEO_START(tia)
- MDRV_VIDEO_UPDATE(tia)
+ MCFG_VIDEO_START(tia)
+ MCFG_VIDEO_UPDATE(tia)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("tia", TIA, MASTER_CLOCK/114)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tia", TIA, MASTER_CLOCK/114)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 5a19670a6c3..834f8d6851a 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -546,57 +546,57 @@ static const namcoio_interface intf2 =
static MACHINE_CONFIG_START( liblrabl, toypop_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 1536000) /* 1.536 MHz (measured on Libble Rabble board) */
- MDRV_CPU_PROGRAM_MAP(liblrabl_map)
- MDRV_CPU_VBLANK_INT("screen", toypop_main_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, 1536000) /* 1.536 MHz (measured on Libble Rabble board) */
+ MCFG_CPU_PROGRAM_MAP(liblrabl_map)
+ MCFG_CPU_VBLANK_INT("screen", toypop_main_interrupt)
- MDRV_CPU_ADD("audiocpu", M6809, 1536000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("audiocpu", M6809, 1536000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("sub", M68000, 6144000) /* 6.144 MHz (measured on Libble Rabble board) */
- MDRV_CPU_PROGRAM_MAP(m68k_map)
- MDRV_CPU_VBLANK_INT("screen", toypop_m68000_interrupt)
+ MCFG_CPU_ADD("sub", M68000, 6144000) /* 6.144 MHz (measured on Libble Rabble board) */
+ MCFG_CPU_PROGRAM_MAP(m68k_map)
+ MCFG_CPU_VBLANK_INT("screen", toypop_m68000_interrupt)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_RESET(toypop)
+ MCFG_MACHINE_RESET(toypop)
- MDRV_NAMCO58XX_ADD("58xx", intf0)
- MDRV_NAMCO56XX_ADD("56xx_1", intf1)
- MDRV_NAMCO56XX_ADD("56xx_2", intf2)
+ MCFG_NAMCO58XX_ADD("58xx", intf0)
+ MCFG_NAMCO56XX_ADD("56xx_1", intf1)
+ MCFG_NAMCO56XX_ADD("56xx_2", intf2)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.606060)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.606060)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(toypop)
- MDRV_PALETTE_LENGTH(128*4+64*4+16*2)
+ MCFG_GFXDECODE(toypop)
+ MCFG_PALETTE_LENGTH(128*4+64*4+16*2)
- MDRV_PALETTE_INIT(toypop)
- MDRV_VIDEO_START(toypop)
- MDRV_VIDEO_UPDATE(toypop)
+ MCFG_PALETTE_INIT(toypop)
+ MCFG_VIDEO_START(toypop)
+ MCFG_VIDEO_UPDATE(toypop)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO_15XX, 24000)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO_15XX, 24000)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( toypop, liblrabl )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(toypop_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(toypop_map)
- MDRV_DEVICE_REMOVE("58xx")
- MDRV_NAMCO58XX_ADD("58xx", intf0_coin)
+ MCFG_DEVICE_REMOVE("58xx")
+ MCFG_NAMCO58XX_ADD("58xx", intf0_coin)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index 705de99967a..a7f4f40896f 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -277,60 +277,60 @@ GFXDECODE_END
static MACHINE_CONFIG_START( tp84, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("cpu1",M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(tp84_cpu1_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("cpu1",M6809, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(tp84_cpu1_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", M6809, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", M6809, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", Z80,XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_START(tp84)
+ MCFG_MACHINE_START(tp84)
/* 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)
+ 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)
- MDRV_GFXDECODE(tp84)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(tp84)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(tp84)
- MDRV_VIDEO_START(tp84)
- MDRV_VIDEO_UPDATE(tp84)
+ MCFG_PALETTE_INIT(tp84)
+ MCFG_VIDEO_START(tp84)
+ MCFG_VIDEO_UPDATE(tp84)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.75)
+ MCFG_SOUND_ADD("sn1", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.75)
- MDRV_SOUND_ADD("sn2", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 0.75)
+ MCFG_SOUND_ADD("sn2", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 0.75)
- MDRV_SOUND_ADD("sn3", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 0.75)
+ MCFG_SOUND_ADD("sn3", SN76489A, XTAL_14_31818MHz/8) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 0.75)
- MDRV_SOUND_ADD("filter1", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter2", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter3", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter1", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter2", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter3", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tp84b, tp84 )
- MDRV_CPU_MODIFY("cpu1")
- MDRV_CPU_PROGRAM_MAP(tp84b_cpu1_map)
+ MCFG_CPU_MODIFY("cpu1")
+ MCFG_CPU_PROGRAM_MAP(tp84b_cpu1_map)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 6c4560dede8..e110cdc2710 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -885,137 +885,137 @@ static MACHINE_RESET( trackfld )
static MACHINE_CONFIG_START( trackfld, trackfld_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6/2) /* a guess for now */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6/2) /* a guess for now */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(trackfld)
- MDRV_MACHINE_RESET(trackfld)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(trackfld)
+ MCFG_MACHINE_RESET(trackfld)
+ 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(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_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)
- MDRV_GFXDECODE(trackfld)
- MDRV_PALETTE_LENGTH(16*16+16*16)
+ MCFG_GFXDECODE(trackfld)
+ MCFG_PALETTE_LENGTH(16*16+16*16)
- MDRV_PALETTE_INIT(trackfld)
- MDRV_VIDEO_START(trackfld)
- MDRV_VIDEO_UPDATE(trackfld)
+ MCFG_PALETTE_INIT(trackfld)
+ MCFG_VIDEO_START(trackfld)
+ MCFG_VIDEO_UPDATE(trackfld)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("snsnd", SN76496, SOUND_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76496, SOUND_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("vlm", VLM5030, VLM_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("vlm", VLM5030, VLM_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( yieartf, trackfld_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6/2) /* a guess for now */
- MDRV_CPU_PROGRAM_MAP(yieartf_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6/2) /* a guess for now */
+ MCFG_CPU_PROGRAM_MAP(yieartf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
// z80 isn't used
-// MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
-// MDRV_CPU_PROGRAM_MAP(sound_map)
+// MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
+// MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(trackfld)
- MDRV_MACHINE_RESET(trackfld)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(trackfld)
+ MCFG_MACHINE_RESET(trackfld)
+ 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(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_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)
- MDRV_GFXDECODE(trackfld)
- MDRV_PALETTE_LENGTH(16*16+16*16)
+ MCFG_GFXDECODE(trackfld)
+ MCFG_PALETTE_LENGTH(16*16+16*16)
- MDRV_PALETTE_INIT(trackfld)
- MDRV_VIDEO_START(trackfld)
- MDRV_VIDEO_UPDATE(trackfld)
+ MCFG_PALETTE_INIT(trackfld)
+ MCFG_VIDEO_START(trackfld)
+ MCFG_VIDEO_UPDATE(trackfld)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("snsnd", SN76496, SOUND_CLOCK/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76496, SOUND_CLOCK/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("vlm", VLM5030, VLM_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("vlm", VLM5030, VLM_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* same as the original, but uses ADPCM instead of VLM5030 */
/* also different memory handlers do handle that */
static MACHINE_CONFIG_DERIVED( hyprolyb, trackfld )
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(hyprolyb_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(hyprolyb_sound_map)
- MDRV_MACHINE_START(trackfld)
- MDRV_MACHINE_RESET(trackfld)
+ MCFG_MACHINE_START(trackfld)
+ MCFG_MACHINE_RESET(trackfld)
/* sound hardware */
- MDRV_DEVICE_REMOVE("vlm")
- MDRV_FRAGMENT_ADD(hyprolyb_adpcm)
+ MCFG_DEVICE_REMOVE("vlm")
+ MCFG_FRAGMENT_ADD(hyprolyb_adpcm)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( atlantol, hyprolyb )
- MDRV_VIDEO_START(atlantol)
+ MCFG_VIDEO_START(atlantol)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mastkin, trackfld )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(mastkin_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(mastkin_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wizzquiz, trackfld )
/* basic machine hardware */
// right cpu?
- MDRV_CPU_REPLACE("maincpu",M6800,2048000) /* 1.400 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(wizzquiz_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("maincpu",M6800,2048000) /* 1.400 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(wizzquiz_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( reaktor, trackfld )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu",Z80,MASTER_CLOCK/6)
- MDRV_CPU_PROGRAM_MAP(reaktor_map)
- MDRV_CPU_IO_MAP(reaktor_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_REPLACE("maincpu",Z80,MASTER_CLOCK/6)
+ MCFG_CPU_PROGRAM_MAP(reaktor_map)
+ MCFG_CPU_IO_MAP(reaktor_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index bfdcb8ed16d..d3345d1ca9a 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -300,39 +300,39 @@ static MACHINE_RESET( travrusa )
static MACHINE_CONFIG_START( travrusa, travrusa_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_RESET(travrusa)
+ MCFG_MACHINE_RESET(travrusa)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(56.75)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790) /* accurate frequency, measured on a Moon Patrol board, is 56.75Hz. */)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(56.75)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790) /* accurate frequency, measured on a Moon Patrol board, is 56.75Hz. */)
/* the Lode Runner manual (similar but different hardware) */
/* talks about 55Hz and 1790ms vblank duration. */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(travrusa)
+ MCFG_GFXDECODE(travrusa)
- MDRV_PALETTE_LENGTH(16*8+16*8)
+ MCFG_PALETTE_LENGTH(16*8+16*8)
- MDRV_PALETTE_INIT(travrusa)
- MDRV_VIDEO_START(travrusa)
- MDRV_VIDEO_UPDATE(travrusa)
+ MCFG_PALETTE_INIT(travrusa)
+ MCFG_VIDEO_START(travrusa)
+ MCFG_VIDEO_UPDATE(travrusa)
/* sound hardware */
- MDRV_FRAGMENT_ADD(m52_sound_c_audio)
+ MCFG_FRAGMENT_ADD(m52_sound_c_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( shtrider, travrusa )
/* video hardware */
- MDRV_GFXDECODE(shtrider)
- MDRV_PALETTE_INIT(shtrider)
+ MCFG_GFXDECODE(shtrider)
+ MCFG_PALETTE_INIT(shtrider)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c
index 0dfcbc68ca5..5db6b68217c 100644
--- a/src/mame/drivers/triforce.c
+++ b/src/mame/drivers/triforce.c
@@ -421,26 +421,26 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( triforce_base, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GA, 64000000) /* Wrong! */
- MDRV_CPU_PROGRAM_MAP(gc_map)
+ MCFG_CPU_ADD("maincpu", PPC403GA, 64000000) /* Wrong! */
+ MCFG_CPU_PROGRAM_MAP(gc_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_VIDEO_START(triforce)
- MDRV_VIDEO_UPDATE(triforce)
+ MCFG_VIDEO_START(triforce)
+ MCFG_VIDEO_UPDATE(triforce)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( triforcegd, triforce_base )
- MDRV_NAOMI_DIMM_BOARD_ADD("rom_board", "gdrom", "user1", "picreturn")
+ MCFG_NAOMI_DIMM_BOARD_ADD("rom_board", "gdrom", "user1", "picreturn")
MACHINE_CONFIG_END
#define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index 99ce40389cd..755acb9b3a9 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -312,35 +312,35 @@ static PALETTE_INIT( triplhnt )
static MACHINE_CONFIG_START( triplhnt, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6800, 800000)
- MDRV_CPU_PROGRAM_MAP(triplhnt_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", M6800, 800000)
+ MCFG_CPU_PROGRAM_MAP(triplhnt_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
-
- MDRV_GFXDECODE(triplhnt)
- MDRV_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(triplhnt)
- MDRV_VIDEO_START(triplhnt)
- MDRV_VIDEO_UPDATE(triplhnt)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
+
+ MCFG_GFXDECODE(triplhnt)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(triplhnt)
+ MCFG_VIDEO_START(triplhnt)
+ MCFG_VIDEO_UPDATE(triplhnt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(triplhnt_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(triplhnt_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(triplhnt)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(triplhnt)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index 83ec423c157..23e06f5d688 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -135,31 +135,31 @@ static INTERRUPT_GEN( truco_interrupt )
static MACHINE_CONFIG_START( truco, truco_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 750000) /* ?? guess */
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6809, 750000) /* ?? guess */
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", truco_interrupt)
+ MCFG_CPU_VBLANK_INT("screen", truco_interrupt)
- MDRV_MACHINE_RESET(truco)
+ MCFG_MACHINE_RESET(truco)
/* 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(256, 192)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1)
+ 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(256, 192)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 192-1)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_PALETTE_INIT(truco)
- MDRV_VIDEO_UPDATE(truco)
+ MCFG_PALETTE_INIT(truco)
+ MCFG_VIDEO_UPDATE(truco)
/* 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.80)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index f4895cc62f5..b25ca7d1781 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -129,30 +129,30 @@ static INTERRUPT_GEN( trucocl_interrupt )
static MACHINE_CONFIG_START( trucocl, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", trucocl_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", trucocl_interrupt)
/* 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, 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(trucocl)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(trucocl)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(trucocl)
- MDRV_VIDEO_START(trucocl)
- MDRV_VIDEO_UPDATE(trucocl)
+ MCFG_PALETTE_INIT(trucocl)
+ MCFG_VIDEO_START(trucocl)
+ MCFG_VIDEO_UPDATE(trucocl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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/trvmadns.c b/src/mame/drivers/trvmadns.c
index 12fea56e836..b2bd7c285f0 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -323,32 +323,32 @@ static MACHINE_RESET( trvmadns )
}
static MACHINE_CONFIG_START( trvmadns, driver_device )
- MDRV_CPU_ADD("maincpu", Z80,10000000/2) // ?
- MDRV_CPU_PROGRAM_MAP(cpu_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,10000000/2) // ?
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_RESET(trvmadns)
+ MCFG_MACHINE_RESET(trvmadns)
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(trvmadns)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(trvmadns)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(trvmadns)
- MDRV_VIDEO_UPDATE(trvmadns)
+ MCFG_VIDEO_START(trvmadns)
+ MCFG_VIDEO_UPDATE(trvmadns)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 10000000/2/4) //?
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, 10000000/2/4) //?
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index 2a668d733ec..f768aca0eda 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -215,30 +215,30 @@ static INTERRUPT_GEN( trvquest_interrupt )
static MACHINE_CONFIG_START( trvquest, gameplan_state )
- MDRV_CPU_ADD("maincpu", M6809,XTAL_6MHz/4)
- MDRV_CPU_PROGRAM_MAP(cpu_map)
- MDRV_CPU_VBLANK_INT("screen", trvquest_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809,XTAL_6MHz/4)
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_VBLANK_INT("screen", trvquest_interrupt)
- MDRV_NVRAM_ADD_1FILL("nvram")
- MDRV_MACHINE_START(trvquest)
- MDRV_MACHINE_RESET(trvquest)
+ MCFG_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(trvquest)
+ MCFG_MACHINE_RESET(trvquest)
/* video hardware */
- MDRV_FRAGMENT_ADD(trvquest_video)
+ MCFG_FRAGMENT_ADD(trvquest_video)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_6MHz/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_6MHz/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_6MHz/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* via */
- MDRV_VIA6522_ADD("via6522_0", 0, trvquest_via_0_interface)
- MDRV_VIA6522_ADD("via6522_1", 0, via_1_interface)
- MDRV_VIA6522_ADD("via6522_2", 0, via_2_interface)
+ MCFG_VIA6522_ADD("via6522_0", 0, trvquest_via_0_interface)
+ MCFG_VIA6522_ADD("via6522_1", 0, via_1_interface)
+ MCFG_VIA6522_ADD("via6522_2", 0, via_2_interface)
MACHINE_CONFIG_END
ROM_START( trvquest )
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index cc69d37f575..d58b78fec14 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -187,33 +187,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( tryout, tryout_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 2000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_cpu)
+ MCFG_CPU_ADD("maincpu", M6502, 2000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(main_cpu)
- MDRV_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_cpu)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse,1000) /* controls BGM tempo, 1000 is an hand-tuned value to match a side-by-side video */
+ MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse,1000) /* controls BGM tempo, 1000 is an hand-tuned value to match a side-by-side video */
/* 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ 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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tryout)
- MDRV_PALETTE_LENGTH(0x20)
- MDRV_PALETTE_INIT(tryout)
+ MCFG_GFXDECODE(tryout)
+ MCFG_PALETTE_LENGTH(0x20)
+ MCFG_PALETTE_INIT(tryout)
- MDRV_VIDEO_START(tryout)
- MDRV_VIDEO_UPDATE(tryout)
+ MCFG_VIDEO_START(tryout)
+ MCFG_VIDEO_UPDATE(tryout)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
ROM_START( tryout )
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 318738f78af..2ce0b5f2305 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -644,129 +644,129 @@ GFXDECODE_END
static MACHINE_CONFIG_START( tsamurai, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(z80_io_map)
- MDRV_CPU_VBLANK_INT("screen", samurai_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(z80_io_map)
+ MCFG_CPU_VBLANK_INT("screen", samurai_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound1_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound1_map)
- MDRV_CPU_ADD("audio2", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound2_map)
+ MCFG_CPU_ADD("audio2", Z80, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound2_map)
/* 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(0, 255, 8, 255-8)
+ 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(0, 255, 8, 255-8)
- MDRV_GFXDECODE(tsamurai)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(tsamurai)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(tsamurai)
- MDRV_VIDEO_UPDATE(tsamurai)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(tsamurai)
+ MCFG_VIDEO_UPDATE(tsamurai)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( m660, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(m660_map)
- MDRV_CPU_IO_MAP(z80_m660_io_map)
- MDRV_CPU_VBLANK_INT("screen", samurai_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(m660_map)
+ MCFG_CPU_IO_MAP(z80_m660_io_map)
+ MCFG_CPU_VBLANK_INT("screen", samurai_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound1_m660_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound1_m660_map)
- MDRV_CPU_ADD("audio2", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound2_m660_map)
+ MCFG_CPU_ADD("audio2", Z80, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound2_m660_map)
- MDRV_CPU_ADD("audio3", Z80, 2000000)
- MDRV_CPU_PROGRAM_MAP(sound3_m660_map)
- MDRV_CPU_IO_MAP(sound3_m660_io_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("audio3", Z80, 2000000)
+ MCFG_CPU_PROGRAM_MAP(sound3_m660_map)
+ MCFG_CPU_IO_MAP(sound3_m660_io_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* 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(0, 255, 8, 255-8)
+ 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(0, 255, 8, 255-8)
- MDRV_GFXDECODE(tsamurai)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(tsamurai)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(tsamurai)
- MDRV_VIDEO_UPDATE(tsamurai)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(tsamurai)
+ MCFG_VIDEO_UPDATE(tsamurai)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( vsgongf, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(vsgongf_map)
- MDRV_CPU_VBLANK_INT("screen", samurai_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(vsgongf_map)
+ MCFG_CPU_VBLANK_INT("screen", samurai_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_vsgongf_map)
- MDRV_CPU_IO_MAP(vsgongf_audio_io_map)
- MDRV_CPU_VBLANK_INT_HACK(vsgongf_sound_interrupt,3)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_vsgongf_map)
+ MCFG_CPU_IO_MAP(vsgongf_audio_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(vsgongf_sound_interrupt,3)
/* 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(0, 255, 8, 255-8)
+ 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(0, 255, 8, 255-8)
- MDRV_GFXDECODE(tsamurai)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(tsamurai)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(vsgongf)
- MDRV_VIDEO_UPDATE(vsgongf)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(vsgongf)
+ MCFG_VIDEO_UPDATE(vsgongf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- 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/ttchamp.c b/src/mame/drivers/ttchamp.c
index f5178a00921..f229e4afb6e 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -224,23 +224,23 @@ static INTERRUPT_GEN( ttchamp_irq ) /* right? */
static MACHINE_CONFIG_START( ttchamp, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30, 8000000)
- MDRV_CPU_PROGRAM_MAP(ttchamp_map)
- MDRV_CPU_IO_MAP(ttchamp_io)
- MDRV_CPU_VBLANK_INT("screen", ttchamp_irq)
+ MCFG_CPU_ADD("maincpu", V30, 8000000)
+ MCFG_CPU_PROGRAM_MAP(ttchamp_map)
+ MCFG_CPU_IO_MAP(ttchamp_io)
+ MCFG_CPU_VBLANK_INT("screen", ttchamp_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(1024,1024)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-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(1024,1024)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
- MDRV_PALETTE_LENGTH(0x8000)
+ MCFG_PALETTE_LENGTH(0x8000)
- MDRV_VIDEO_START(ttchamp)
- MDRV_VIDEO_UPDATE(ttchamp)
+ MCFG_VIDEO_START(ttchamp)
+ MCFG_VIDEO_UPDATE(ttchamp)
MACHINE_CONFIG_END
ROM_START( ttchamp )
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 0af8aee2eed..dc0338c035f 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -895,119 +895,119 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( tubep, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(tubep_main_map)
- MDRV_CPU_IO_MAP(tubep_main_portmap)
+ MCFG_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(tubep_main_map)
+ MCFG_CPU_IO_MAP(tubep_main_portmap)
- MDRV_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(tubep_second_map)
- MDRV_CPU_IO_MAP(tubep_second_portmap)
+ MCFG_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(tubep_second_map)
+ MCFG_CPU_IO_MAP(tubep_second_portmap)
- MDRV_CPU_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
- MDRV_CPU_PROGRAM_MAP(tubep_sound_map)
- MDRV_CPU_IO_MAP(tubep_sound_portmap)
+ MCFG_CPU_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
+ MCFG_CPU_PROGRAM_MAP(tubep_sound_map)
+ MCFG_CPU_IO_MAP(tubep_sound_portmap)
- MDRV_CPU_ADD("mcu",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
- MDRV_CPU_PROGRAM_MAP(nsc_map)
+ MCFG_CPU_ADD("mcu",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
+ MCFG_CPU_PROGRAM_MAP(nsc_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(tubep)
- MDRV_MACHINE_RESET(tubep)
+ MCFG_MACHINE_START(tubep)
+ MCFG_MACHINE_RESET(tubep)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 264)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 264)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(32 + 256*64)
+ MCFG_PALETTE_LENGTH(32 + 256*64)
- MDRV_PALETTE_INIT(tubep)
- MDRV_VIDEO_START(tubep)
- MDRV_VIDEO_RESET(tubep)
- MDRV_VIDEO_UPDATE(tubep)
+ MCFG_PALETTE_INIT(tubep)
+ MCFG_VIDEO_START(tubep)
+ MCFG_VIDEO_RESET(tubep)
+ MCFG_VIDEO_UPDATE(tubep)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 19968000 / 8 / 2)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay1", AY8910, 19968000 / 8 / 2)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("ay2", AY8910, 19968000 / 8 / 2)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay2", AY8910, 19968000 / 8 / 2)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("ay3", AY8910, 19968000 / 8 / 2)
- MDRV_SOUND_CONFIG(ay8910_interface_3)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay3", AY8910, 19968000 / 8 / 2)
+ MCFG_SOUND_CONFIG(ay8910_interface_3)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tubepb, tubep )
- MDRV_CPU_REPLACE("mcu", M6802,6000000) /* ? MHz Xtal */
- MDRV_CPU_PROGRAM_MAP(nsc_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_REPLACE("mcu", M6802,6000000) /* ? MHz Xtal */
+ MCFG_CPU_PROGRAM_MAP(nsc_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( rjammer, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(rjammer_main_map)
- MDRV_CPU_IO_MAP(rjammer_main_portmap)
+ MCFG_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(rjammer_main_map)
+ MCFG_CPU_IO_MAP(rjammer_main_portmap)
- MDRV_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(rjammer_second_map)
- MDRV_CPU_IO_MAP(rjammer_second_portmap)
+ MCFG_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(rjammer_second_map)
+ MCFG_CPU_IO_MAP(rjammer_second_portmap)
- MDRV_CPU_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
- MDRV_CPU_PROGRAM_MAP(rjammer_sound_map)
- MDRV_CPU_IO_MAP(rjammer_sound_portmap)
+ MCFG_CPU_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
+ MCFG_CPU_PROGRAM_MAP(rjammer_sound_map)
+ MCFG_CPU_IO_MAP(rjammer_sound_portmap)
- MDRV_CPU_ADD("mcu",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
- MDRV_CPU_PROGRAM_MAP(nsc_map)
+ MCFG_CPU_ADD("mcu",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
+ MCFG_CPU_PROGRAM_MAP(nsc_map)
- MDRV_MACHINE_START(rjammer)
- MDRV_MACHINE_RESET(rjammer)
+ MCFG_MACHINE_START(rjammer)
+ MCFG_MACHINE_RESET(rjammer)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 264)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 264)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(rjammer)
- MDRV_VIDEO_START(tubep)
- MDRV_VIDEO_RESET(tubep)
- MDRV_VIDEO_UPDATE(rjammer)
+ MCFG_PALETTE_INIT(rjammer)
+ MCFG_VIDEO_START(tubep)
+ MCFG_VIDEO_RESET(tubep)
+ MCFG_VIDEO_UPDATE(rjammer)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 19968000 / 8 / 2)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay1", AY8910, 19968000 / 8 / 2)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("ay2", AY8910, 19968000 / 8 / 2)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay2", AY8910, 19968000 / 8 / 2)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("ay3", AY8910, 19968000 / 8 / 2)
- MDRV_SOUND_CONFIG(ay8910_interface_3)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ay3", AY8910, 19968000 / 8 / 2)
+ MCFG_SOUND_CONFIG(ay8910_interface_3)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 8ade9910948..1887f475af5 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -314,32 +314,32 @@ GFXDECODE_END
static MACHINE_CONFIG_START( tugboat, driver_device )
- MDRV_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_RESET(tugboat)
+ MCFG_MACHINE_RESET(tugboat)
- MDRV_PIA6821_ADD("pia0", pia0_intf)
- MDRV_PIA6821_ADD("pia1", pia1_intf)
+ MCFG_PIA6821_ADD("pia0", pia0_intf)
+ MCFG_PIA6821_ADD("pia1", pia1_intf)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8,32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8,31*8-1,2*8,30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8,32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8,31*8-1,2*8,30*8-1)
- MDRV_GFXDECODE(tugboat)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(tugboat)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(tugboat)
- MDRV_VIDEO_UPDATE(tugboat)
+ MCFG_PALETTE_INIT(tugboat)
+ MCFG_VIDEO_UPDATE(tugboat)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index adfa8f57505..0cf8fe70df9 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -2077,135 +2077,135 @@ static MACHINE_RESET( tumbleb )
static MACHINE_CONFIG_START( tumblepb, tumbleb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(tumblepopb_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(tumblepopb_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(tumbleb)
- MDRV_MACHINE_RESET(tumbleb)
+ MCFG_MACHINE_START(tumbleb)
+ MCFG_MACHINE_RESET(tumbleb)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tumbleb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tumbleb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(tumblepb)
- MDRV_VIDEO_UPDATE(tumblepb)
+ MCFG_VIDEO_START(tumblepb)
+ MCFG_VIDEO_UPDATE(tumblepb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tumbleb2, tumbleb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(tumblepopb_main_map)
- MDRV_CPU_VBLANK_INT("screen", tumbleb2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(tumblepopb_main_map)
+ MCFG_CPU_VBLANK_INT("screen", tumbleb2_interrupt)
- MDRV_MACHINE_START(tumbleb)
- MDRV_MACHINE_RESET(tumbleb)
+ MCFG_MACHINE_START(tumbleb)
+ MCFG_MACHINE_RESET(tumbleb)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tumbleb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tumbleb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(tumblepb)
- MDRV_VIDEO_UPDATE(tumblepb)
+ MCFG_VIDEO_START(tumblepb)
+ MCFG_VIDEO_UPDATE(tumblepb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jumpkids, tumbleb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(jumpkids_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(jumpkids_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
/* z80? */
- MDRV_CPU_ADD("audiocpu", Z80, 8000000/2)
- MDRV_CPU_PROGRAM_MAP(jumpkids_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000/2)
+ MCFG_CPU_PROGRAM_MAP(jumpkids_sound_map)
- MDRV_MACHINE_START(tumbleb)
- MDRV_MACHINE_RESET(tumbleb)
+ MCFG_MACHINE_START(tumbleb)
+ MCFG_MACHINE_RESET(tumbleb)
/* video hardware */
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tumbleb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tumbleb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(tumblepb)
- MDRV_VIDEO_UPDATE(jumpkids)
+ MCFG_VIDEO_START(tumblepb)
+ MCFG_VIDEO_UPDATE(jumpkids)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 8000000/8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_OKIM6295_ADD("oki", 8000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fncywld, tumbleb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(fncywld_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(fncywld_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_MACHINE_START(tumbleb)
- MDRV_MACHINE_RESET(tumbleb)
+ MCFG_MACHINE_START(tumbleb)
+ MCFG_MACHINE_RESET(tumbleb)
/* video hardware */
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(fncywld)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(fncywld)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(fncywld)
- MDRV_VIDEO_UPDATE(fncywld)
+ MCFG_VIDEO_START(fncywld)
+ MCFG_VIDEO_UPDATE(fncywld)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MDRV_OKIM6295_ADD("oki", 1023924, 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("oki", 1023924, 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
@@ -2239,189 +2239,189 @@ static MACHINE_RESET (htchctch)
static MACHINE_CONFIG_START( htchctch, tumbleb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 15000000) /* verified */
- MDRV_CPU_PROGRAM_MAP(htchctch_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 15000000) /* verified */
+ MCFG_CPU_PROGRAM_MAP(htchctch_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 15000000/4) /* verified on dquizgo */
- MDRV_CPU_PROGRAM_MAP(semicom_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 15000000/4) /* verified on dquizgo */
+ MCFG_CPU_PROGRAM_MAP(semicom_sound_map)
- MDRV_MACHINE_START(tumbleb)
- MDRV_MACHINE_RESET(htchctch)
+ MCFG_MACHINE_START(tumbleb)
+ MCFG_MACHINE_RESET(htchctch)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2400)) // ?? cookbib needs it above ~2400 or the Joystick on the How to Play screen is the wrong colour?!
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2400)) // ?? cookbib needs it above ~2400 or the Joystick on the How to Play screen is the wrong colour?!
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tumbleb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tumbleb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(tumblepb)
- MDRV_VIDEO_UPDATE(semicom)
+ MCFG_VIDEO_START(tumblepb)
+ MCFG_VIDEO_UPDATE(semicom)
/* sound hardware - same as hyperpac */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3427190)
- MDRV_SOUND_CONFIG(semicom_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.10)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3427190)
+ MCFG_SOUND_CONFIG(semicom_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.10)
- MDRV_OKIM6295_ADD("oki", 1024000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1024000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cookbib, htchctch )
- MDRV_VIDEO_UPDATE( semicom_altoffsets )
+ MCFG_VIDEO_UPDATE( semicom_altoffsets )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cookbib_mcu, htchctch )
/* basic machine hardware */
- MDRV_CPU_ADD("protection", I8052, 16000000) // AT89C52
- MDRV_CPU_PROGRAM_MAP(protection_map)
- MDRV_CPU_IO_MAP(protection_iomap)
+ MCFG_CPU_ADD("protection", I8052, 16000000) // AT89C52
+ MCFG_CPU_PROGRAM_MAP(protection_map)
+ MCFG_CPU_IO_MAP(protection_iomap)
/* video hardware */
- MDRV_VIDEO_UPDATE( semicom_altoffsets )
+ MCFG_VIDEO_UPDATE( semicom_altoffsets )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bcstory, htchctch )
- MDRV_VIDEO_UPDATE(bcstory)
+ MCFG_VIDEO_UPDATE(bcstory)
- MDRV_SOUND_REPLACE("ymsnd", YM2151, 3427190)
- MDRV_SOUND_CONFIG(semicom_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.10)
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, 3427190)
+ MCFG_SOUND_CONFIG(semicom_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( semibase, bcstory )
- MDRV_VIDEO_UPDATE(semibase )
+ MCFG_VIDEO_UPDATE(semibase )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sdfight, bcstory )
- MDRV_VIDEO_START(sdfight)
- MDRV_VIDEO_UPDATE(sdfight)
+ MCFG_VIDEO_START(sdfight)
+ MCFG_VIDEO_UPDATE(sdfight)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( metlsavr, cookbib )
- MDRV_SOUND_REPLACE("ymsnd", YM2151, 3427190)
- MDRV_SOUND_CONFIG(semicom_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.10)
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, 3427190)
+ MCFG_SOUND_CONFIG(semicom_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jumppop, tumbleb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(jumppop_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(jumppop_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3500000) /* verified */
- MDRV_CPU_PROGRAM_MAP(jumppop_sound_map)
- MDRV_CPU_IO_MAP(jumppop_sound_io_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1953) /* measured */
+ MCFG_CPU_ADD("audiocpu", Z80, 3500000) /* verified */
+ MCFG_CPU_PROGRAM_MAP(jumppop_sound_map)
+ MCFG_CPU_IO_MAP(jumppop_sound_io_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 1953) /* measured */
- MDRV_MACHINE_START(tumbleb)
- MDRV_MACHINE_RESET(tumbleb)
+ MCFG_MACHINE_START(tumbleb)
+ MCFG_MACHINE_RESET(tumbleb)
/* video hardware */
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(jumppop)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(jumppop)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(jumppop)
- MDRV_VIDEO_UPDATE(jumppop)
+ MCFG_VIDEO_START(jumppop)
+ MCFG_VIDEO_UPDATE(jumppop)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70)
- MDRV_OKIM6295_ADD("oki", 875000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 875000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( suprtrio, tumbleb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */
- MDRV_CPU_PROGRAM_MAP(suprtrio_main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */
+ MCFG_CPU_PROGRAM_MAP(suprtrio_main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(suprtrio_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(suprtrio_sound_map)
- MDRV_MACHINE_START(tumbleb)
- MDRV_MACHINE_RESET(tumbleb)
+ MCFG_MACHINE_START(tumbleb)
+ MCFG_MACHINE_RESET(tumbleb)
/* video hardware */
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8-1, 31*8-2)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8-1, 31*8-2)
- MDRV_GFXDECODE(suprtrio)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(suprtrio)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(suprtrio)
- MDRV_VIDEO_UPDATE(suprtrio)
+ MCFG_VIDEO_START(suprtrio)
+ MCFG_VIDEO_UPDATE(suprtrio)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 875000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 875000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pangpang, tumbleb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(pangpang_main_map)
- MDRV_CPU_VBLANK_INT("screen", tumbleb2_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(pangpang_main_map)
+ MCFG_CPU_VBLANK_INT("screen", tumbleb2_interrupt)
- MDRV_MACHINE_START(tumbleb)
- MDRV_MACHINE_RESET(tumbleb)
+ MCFG_MACHINE_START(tumbleb)
+ MCFG_MACHINE_RESET(tumbleb)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(tumbleb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tumbleb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(pangpang)
- MDRV_VIDEO_UPDATE(pangpang)
+ MCFG_VIDEO_START(pangpang)
+ MCFG_VIDEO_UPDATE(pangpang)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index d4e39d0e144..f924622dc51 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -306,41 +306,41 @@ static MACHINE_START( tumblep )
static MACHINE_CONFIG_START( tumblep, tumblep_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 14000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 14000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45; Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/8) /* Custom chip 45; Audio section crystal is 32.220 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(tumblep)
+ MCFG_MACHINE_START(tumblep)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-2, 1*8, 31*8-1) // hmm
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-2, 1*8, 31*8-1) // hmm
- MDRV_GFXDECODE(tumblep)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(tumblep)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_UPDATE(tumblep)
+ MCFG_VIDEO_UPDATE(tumblep)
- MDRV_DECO16IC_ADD("deco_custom", tumblep_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", tumblep_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index b570d689eb0..9d20a421a3b 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -304,35 +304,35 @@ static const pokey_interface pokey_interface_2 =
static MACHINE_CONFIG_START( tunhunt, tunhunt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502,2000000) /* ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ? probably wrong */
+ MCFG_CPU_ADD("maincpu", M6502,2000000) /* ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ? probably wrong */
/* 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(256, 256-16)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 255-16)
+ 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(256, 256-16)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 255-16)
- MDRV_GFXDECODE(tunhunt)
- MDRV_PALETTE_LENGTH(0x1a)
+ MCFG_GFXDECODE(tunhunt)
+ MCFG_PALETTE_LENGTH(0x1a)
- MDRV_PALETTE_INIT(tunhunt)
- MDRV_VIDEO_START(tunhunt)
- MDRV_VIDEO_UPDATE(tunhunt)
+ MCFG_PALETTE_INIT(tunhunt)
+ MCFG_VIDEO_START(tunhunt)
+ MCFG_VIDEO_UPDATE(tunhunt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey1", POKEY, 1209600)
- MDRV_SOUND_CONFIG(pokey_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey1", POKEY, 1209600)
+ MCFG_SOUND_CONFIG(pokey_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("pokey2", POKEY, 1209600)
- MDRV_SOUND_CONFIG(pokey_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("pokey2", POKEY, 1209600)
+ MCFG_SOUND_CONFIG(pokey_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 2219834fe82..45e84657aaf 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -1077,93 +1077,93 @@ GFXDECODE_END
static MACHINE_CONFIG_START( turbo, turbo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(turbo_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(turbo_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_PPI8255_ADD( "ppi8255_0", turbo_8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", turbo_8255_intf[1] )
- MDRV_PPI8255_ADD( "ppi8255_2", turbo_8255_intf[2] )
- MDRV_PPI8255_ADD( "ppi8255_3", turbo_8255_intf[3] )
+ MCFG_PPI8255_ADD( "ppi8255_0", turbo_8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", turbo_8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_2", turbo_8255_intf[2] )
+ MCFG_PPI8255_ADD( "ppi8255_3", turbo_8255_intf[3] )
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_GFXDECODE(turbo)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_GFXDECODE(turbo)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(turbo)
- MDRV_VIDEO_START(turbo)
- MDRV_VIDEO_UPDATE(turbo)
+ MCFG_PALETTE_INIT(turbo)
+ MCFG_VIDEO_START(turbo)
+ MCFG_VIDEO_UPDATE(turbo)
/* sound hardware */
- MDRV_FRAGMENT_ADD(turbo_samples)
+ MCFG_FRAGMENT_ADD(turbo_samples)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( subroc3d, turbo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(subroc3d_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(subroc3d_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_PPI8255_ADD( "ppi8255_0", subroc3d_8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", subroc3d_8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", subroc3d_8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", subroc3d_8255_intf[1] )
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_GFXDECODE(turbo)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_GFXDECODE(turbo)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(subroc3d)
- MDRV_VIDEO_START(turbo)
- MDRV_VIDEO_UPDATE(subroc3d)
+ MCFG_PALETTE_INIT(subroc3d)
+ MCFG_VIDEO_START(turbo)
+ MCFG_VIDEO_UPDATE(subroc3d)
/* sound hardware */
- MDRV_FRAGMENT_ADD(subroc3d_samples)
+ MCFG_FRAGMENT_ADD(subroc3d_samples)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( buckrog, turbo_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(buckrog_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(buckrog_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(buckrog_cpu2_map)
- MDRV_CPU_IO_MAP(buckrog_cpu2_portmap)
+ MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(buckrog_cpu2_map)
+ MCFG_CPU_IO_MAP(buckrog_cpu2_portmap)
- MDRV_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(buckrog)
+ MCFG_QUANTUM_TIME(HZ(600))
+ MCFG_MACHINE_RESET(buckrog)
- MDRV_PPI8255_ADD( "ppi8255_0", buckrog_8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", buckrog_8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", buckrog_8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", buckrog_8255_intf[1] )
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_GFXDECODE(turbo)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_GFXDECODE(turbo)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(buckrog)
- MDRV_VIDEO_START(buckrog)
- MDRV_VIDEO_UPDATE(buckrog)
+ MCFG_PALETTE_INIT(buckrog)
+ MCFG_VIDEO_START(buckrog)
+ MCFG_VIDEO_UPDATE(buckrog)
/* sound hardware */
- MDRV_FRAGMENT_ADD(buckrog_samples)
+ MCFG_FRAGMENT_ADD(buckrog_samples)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c
index d40f2ece918..be7f515fcb8 100644
--- a/src/mame/drivers/turrett.c
+++ b/src/mame/drivers/turrett.c
@@ -105,22 +105,22 @@ static const r3000_cpu_core r3000_config =
static MACHINE_CONFIG_START( turrett, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R3041BE, R3041_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cpu_map)
- MDRV_CPU_CONFIG(r3000_config)
+ MCFG_CPU_ADD("maincpu", R3041BE, R3041_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_CPU_CONFIG(r3000_config)
/* 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, 64*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0*8, 32*8-1)
- MDRV_PALETTE_LENGTH(0x2000)
+ MCFG_PALETTE_LENGTH(0x2000)
- MDRV_VIDEO_START(turrett)
- MDRV_VIDEO_UPDATE(turrett)
+ MCFG_VIDEO_START(turrett)
+ MCFG_VIDEO_UPDATE(turrett)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index 3bb60732004..796fce37e45 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -222,25 +222,25 @@ static MACHINE_RESET( tutankhm )
static MACHINE_CONFIG_START( tutankhm, tutankhm_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* 1.5 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", tutankhm_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* 1.5 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", tutankhm_interrupt)
- MDRV_MACHINE_START(tutankhm)
- MDRV_MACHINE_RESET(tutankhm)
+ MCFG_MACHINE_START(tutankhm)
+ MCFG_MACHINE_RESET(tutankhm)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* not sure about the visible area */
+ 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* not sure about the visible area */
- MDRV_VIDEO_UPDATE(tutankhm)
+ MCFG_VIDEO_UPDATE(tutankhm)
/* sound hardware */
- MDRV_FRAGMENT_ADD(timeplt_sound)
+ MCFG_FRAGMENT_ADD(timeplt_sound)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index de525b6053d..c9e70ee3582 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -721,121 +721,121 @@ static MACHINE_START( twin16 )
static MACHINE_CONFIG_START( twin16, twin16_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", CPUA_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", CPUA_interrupt)
- MDRV_CPU_ADD("sub", M68000, XTAL_18_432MHz/2)
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_VBLANK_INT("screen", CPUB_interrupt)
+ MCFG_CPU_ADD("sub", M68000, XTAL_18_432MHz/2)
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_VBLANK_INT("screen", CPUB_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_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(twin16)
- MDRV_MACHINE_RESET(twin16)
+ MCFG_MACHINE_START(twin16)
+ MCFG_MACHINE_RESET(twin16)
// video hardware
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(((double)XTAL_18_432MHz / 2) / (576 * 264))
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2062)) // 32 lines
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(((double)XTAL_18_432MHz / 2) / (576 * 264))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2062)) // 32 lines
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(twin16)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(twin16)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(twin16)
- MDRV_VIDEO_UPDATE(twin16)
- MDRV_VIDEO_EOF(twin16)
+ MCFG_VIDEO_START(twin16)
+ MCFG_VIDEO_UPDATE(twin16)
+ MCFG_VIDEO_EOF(twin16)
// sound hardware
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 7159160/2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("konami", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.12) // estimated with gradius2 OST
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.12)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.12)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.12)
-
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 7159160/2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("konami", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.12) // estimated with gradius2 OST
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.12)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.12)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.12)
+
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( devilw, twin16 )
- MDRV_QUANTUM_TIME(HZ(60000)) // watchdog reset otherwise
+ MCFG_QUANTUM_TIME(HZ(60000)) // watchdog reset otherwise
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( fround, twin16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000)
- MDRV_CPU_PROGRAM_MAP(fround_map)
- MDRV_CPU_VBLANK_INT("screen", CPUA_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000)
+ MCFG_CPU_PROGRAM_MAP(fround_map)
+ MCFG_CPU_VBLANK_INT("screen", CPUA_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_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(twin16)
- MDRV_MACHINE_RESET(twin16)
+ MCFG_MACHINE_START(twin16)
+ MCFG_MACHINE_RESET(twin16)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_BUFFERS_SPRITERAM)
- 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 30*8-1)
+ 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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(twin16)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_GFXDECODE(twin16)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_VIDEO_START(twin16)
- MDRV_VIDEO_UPDATE(twin16)
- MDRV_VIDEO_EOF(twin16)
+ MCFG_VIDEO_START(twin16)
+ MCFG_VIDEO_UPDATE(twin16)
+ MCFG_VIDEO_EOF(twin16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 7159160/2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("konami", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.12)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.12)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.12)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.12)
-
- MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 7159160/2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("konami", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.12)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.12)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.12)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.12)
+
+ MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( miaj, twin16 )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 2*8, 30*8-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cuebrickj, twin16 )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 2*8, 30*8-1)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 39*8-1, 2*8, 30*8-1)
+ MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index b3b371d8707..f2589cd0e1f 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -559,59 +559,59 @@ static const ym3812_interface ym3812_config =
static MACHINE_CONFIG_START( twincobr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* 7MHz - Main board Crystal is 28MHz */
- MDRV_CPU_PROGRAM_MAP(main_program_map)
- MDRV_CPU_VBLANK_INT("screen", twincobr_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* 7MHz - Main board Crystal is 28MHz */
+ MCFG_CPU_PROGRAM_MAP(main_program_map)
+ MCFG_CPU_VBLANK_INT("screen", twincobr_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8) /* 3.5MHz */
- MDRV_CPU_PROGRAM_MAP(sound_program_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_28MHz/8) /* 3.5MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_program_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_ADD("dsp", TMS32010, XTAL_28MHz/2) /* 14MHz CLKin */
- MDRV_CPU_PROGRAM_MAP(DSP_program_map)
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL_28MHz/2) /* 14MHz CLKin */
+ MCFG_CPU_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
- MDRV_CPU_IO_MAP(DSP_io_map)
+ MCFG_CPU_IO_MAP(DSP_io_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET(twincobr)
+ MCFG_MACHINE_RESET(twincobr)
/* video hardware */
- MDRV_MC6845_ADD("crtc", HD6845, XTAL_28MHz/8, twincobr_mc6845_intf) /* 3.5MHz measured on CLKin */
+ MCFG_MC6845_ADD("crtc", HD6845, XTAL_28MHz/8, twincobr_mc6845_intf) /* 3.5MHz measured on CLKin */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (XTAL_28MHz / 4) / (446 * 286) )
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (XTAL_28MHz / 4) / (446 * 286) )
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(twincobr)
- MDRV_PALETTE_LENGTH(1792)
+ MCFG_GFXDECODE(twincobr)
+ MCFG_PALETTE_LENGTH(1792)
- MDRV_VIDEO_START(toaplan0)
- MDRV_VIDEO_EOF(toaplan0)
- MDRV_VIDEO_UPDATE(toaplan0)
+ MCFG_VIDEO_START(toaplan0)
+ MCFG_VIDEO_EOF(toaplan0)
+ MCFG_VIDEO_UPDATE(toaplan0)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fsharkbt, twincobr )
- MDRV_CPU_ADD("mcu", I8741, XTAL_28MHz/16)
+ MCFG_CPU_ADD("mcu", I8741, XTAL_28MHz/16)
/* Program Map is internal to the CPU */
- MDRV_CPU_IO_MAP(fsharkbt_i8741_io_map)
- MDRV_DEVICE_DISABLE() /* Internal program code is not dumped */
+ MCFG_CPU_IO_MAP(fsharkbt_i8741_io_map)
+ MCFG_DEVICE_DISABLE() /* Internal program code is not dumped */
- MDRV_MACHINE_RESET(fsharkbt) /* Reset fshark bootleg 8741 MCU data */
+ MCFG_MACHINE_RESET(fsharkbt) /* Reset fshark bootleg 8741 MCU data */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c
index 306b3f6d402..1ab7e7e4a23 100644
--- a/src/mame/drivers/twinkle.c
+++ b/src/mame/drivers/twinkle.c
@@ -923,50 +923,50 @@ static const i2cmem_interface i2cmem_interface =
static MACHINE_CONFIG_START( twinkle, twinkle_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( main_map )
- MDRV_CPU_VBLANK_INT( "mainscreen", psx_vblank )
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
+ MCFG_CPU_PROGRAM_MAP( main_map )
+ MCFG_CPU_VBLANK_INT( "mainscreen", psx_vblank )
- MDRV_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */
- MDRV_CPU_PROGRAM_MAP( sound_map )
+ MCFG_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */
+ MCFG_CPU_PROGRAM_MAP( sound_map )
- MDRV_WATCHDOG_TIME_INIT(MSEC(1200)) /* check TD pin on LTC1232 */
+ MCFG_WATCHDOG_TIME_INIT(MSEC(1200)) /* check TD pin on LTC1232 */
- MDRV_MACHINE_RESET( twinkle )
- MDRV_I2CMEM_ADD("security",i2cmem_interface)
+ MCFG_MACHINE_RESET( twinkle )
+ MCFG_I2CMEM_ADD("security",i2cmem_interface)
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
- MDRV_RTC65271_ADD("rtc", NULL)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_RTC65271_ADD("rtc", NULL)
/* video hardware */
- MDRV_SCREEN_ADD("mainscreen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( 60 )
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC( 0 ))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE( 1024, 1024 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ MCFG_SCREEN_ADD("mainscreen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( 60 )
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC( 0 ))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE( 1024, 1024 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type2 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("speakerleft", "speakerright")
+ MCFG_SPEAKER_STANDARD_STEREO("speakerleft", "speakerright")
- MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
- MDRV_SOUND_CONFIG( twinkle_psxspu_interface )
- MDRV_SOUND_ROUTE( 0, "speakerleft", 0.75 )
- MDRV_SOUND_ROUTE( 1, "speakerright", 0.75 )
+ MCFG_SOUND_ADD( "spu", PSXSPU, 0 )
+ MCFG_SOUND_CONFIG( twinkle_psxspu_interface )
+ MCFG_SOUND_ROUTE( 0, "speakerleft", 0.75 )
+ MCFG_SOUND_ROUTE( 1, "speakerright", 0.75 )
- MDRV_SOUND_ADD("rfsnd", RF5C400, 32000000/2)
- MDRV_SOUND_ROUTE(0, "speakerleft", 1.0)
- MDRV_SOUND_ROUTE(1, "speakerright", 1.0)
+ MCFG_SOUND_ADD("rfsnd", RF5C400, 32000000/2)
+ MCFG_SOUND_ROUTE(0, "speakerleft", 1.0)
+ MCFG_SOUND_ROUTE(1, "speakerright", 1.0)
- MDRV_SOUND_ADD( "cdda", CDDA, 0 )
- MDRV_SOUND_ROUTE( 0, "speakerleft", 1.0 )
- MDRV_SOUND_ROUTE( 1, "speakerright", 1.0 )
+ MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_SOUND_ROUTE( 0, "speakerleft", 1.0 )
+ MCFG_SOUND_ROUTE( 1, "speakerright", 1.0 )
MACHINE_CONFIG_END
static INPUT_PORTS_START( twinkle )
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index a2c1d2f7ec6..e90d631637d 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -168,30 +168,30 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( twins, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30, 8000000)
- MDRV_CPU_PROGRAM_MAP(twins_map)
- MDRV_CPU_IO_MAP(twins_io)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", V30, 8000000)
+ MCFG_CPU_PROGRAM_MAP(twins_map)
+ MCFG_CPU_IO_MAP(twins_io)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320,256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320,256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(twins)
- MDRV_VIDEO_UPDATE(twins)
+ MCFG_VIDEO_START(twins)
+ MCFG_VIDEO_UPDATE(twins)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* The second set has different palette hardware and a different port map */
@@ -256,30 +256,30 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_START( twinsa, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(twins_map)
- MDRV_CPU_IO_MAP(twinsa_io)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(twins_map)
+ MCFG_CPU_IO_MAP(twinsa_io)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320,256)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320,256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
- MDRV_PALETTE_LENGTH(0x1000)
+ MCFG_PALETTE_LENGTH(0x1000)
- MDRV_VIDEO_START(twinsa)
- MDRV_VIDEO_UPDATE(twinsa)
+ MCFG_VIDEO_START(twinsa)
+ MCFG_VIDEO_UPDATE(twinsa)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_16MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_16MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index 9e31d04a763..c2416f18b9c 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -702,154 +702,154 @@ static const ay8910_interface buggybjr_ym2149_interface_2 =
*************************************/
static MACHINE_CONFIG_START( tx1, driver_device )
- MDRV_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(tx1_main)
-// MDRV_WATCHDOG_TIME_INIT(5)
+ MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_CPU_PROGRAM_MAP(tx1_main)
+// MCFG_WATCHDOG_TIME_INIT(5)
- MDRV_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(tx1_math)
+ MCFG_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_CPU_PROGRAM_MAP(tx1_math)
- MDRV_CPU_ADD("audio_cpu", Z80, TX1_PIXEL_CLOCK / 2)
- MDRV_CPU_PROGRAM_MAP(tx1_sound_prg)
- MDRV_CPU_IO_MAP(tx1_sound_io)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, TX1_PIXEL_CLOCK / 4 / 2048 / 2)
+ MCFG_CPU_ADD("audio_cpu", Z80, TX1_PIXEL_CLOCK / 2)
+ MCFG_CPU_PROGRAM_MAP(tx1_sound_prg)
+ MCFG_CPU_IO_MAP(tx1_sound_io)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, TX1_PIXEL_CLOCK / 4 / 2048 / 2)
- MDRV_MACHINE_RESET(tx1)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(tx1)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PPI8255_ADD("ppi8255", tx1_ppi8255_intf)
+ MCFG_PPI8255_ADD("ppi8255", tx1_ppi8255_intf)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(tx1)
- MDRV_VIDEO_EOF(tx1)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(tx1)
+ MCFG_VIDEO_EOF(tx1)
- MDRV_DEFAULT_LAYOUT(layout_triphsxs)
+ MCFG_DEFAULT_LAYOUT(layout_triphsxs)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART)
- MDRV_SCREEN_ADD("cscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART)
+ MCFG_SCREEN_ADD("cscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART)
- MDRV_VIDEO_START(tx1)
- MDRV_VIDEO_UPDATE(tx1)
+ MCFG_VIDEO_START(tx1)
+ MCFG_VIDEO_UPDATE(tx1)
- MDRV_SPEAKER_STANDARD_STEREO("frontleft", "frontright")
-// MDRV_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
+ MCFG_SPEAKER_STANDARD_STEREO("frontleft", "frontright")
+// MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
- MDRV_SOUND_ADD("aysnd", AY8910, TX1_PIXEL_CLOCK / 8)
- MDRV_SOUND_CONFIG(tx1_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.1)
+ MCFG_SOUND_ADD("aysnd", AY8910, TX1_PIXEL_CLOCK / 8)
+ MCFG_SOUND_CONFIG(tx1_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.1)
- MDRV_SOUND_ADD("tx1", TX1, 0)
- MDRV_SOUND_ROUTE(0, "frontleft", 0.2)
- MDRV_SOUND_ROUTE(1, "frontright", 0.2)
+ MCFG_SOUND_ADD("tx1", TX1, 0)
+ MCFG_SOUND_ROUTE(0, "frontleft", 0.2)
+ MCFG_SOUND_ROUTE(1, "frontright", 0.2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( buggyboy, driver_device )
- MDRV_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(buggyboy_main)
-// MDRV_WATCHDOG_TIME_INIT(5)
+ MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_CPU_PROGRAM_MAP(buggyboy_main)
+// MCFG_WATCHDOG_TIME_INIT(5)
- MDRV_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(buggyboy_math)
+ MCFG_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_CPU_PROGRAM_MAP(buggyboy_math)
- MDRV_CPU_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
- MDRV_CPU_PROGRAM_MAP(buggyboy_sound_prg)
- MDRV_CPU_PERIODIC_INT(z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
- MDRV_CPU_IO_MAP(buggyboy_sound_io)
+ MCFG_CPU_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
+ MCFG_CPU_PROGRAM_MAP(buggyboy_sound_prg)
+ MCFG_CPU_PERIODIC_INT(z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
+ MCFG_CPU_IO_MAP(buggyboy_sound_io)
- MDRV_MACHINE_RESET(buggyboy)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(buggyboy)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PPI8255_ADD("ppi8255", buggyboy_ppi8255_intf)
+ MCFG_PPI8255_ADD("ppi8255", buggyboy_ppi8255_intf)
- MDRV_DEFAULT_LAYOUT(layout_triphsxs)
+ MCFG_DEFAULT_LAYOUT(layout_triphsxs)
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
- MDRV_SCREEN_ADD("cscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
+ MCFG_SCREEN_ADD("cscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(buggyboy)
- MDRV_VIDEO_START(buggyboy)
- MDRV_VIDEO_UPDATE(buggyboy)
- MDRV_VIDEO_EOF(buggyboy)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(buggyboy)
+ MCFG_VIDEO_START(buggyboy)
+ MCFG_VIDEO_UPDATE(buggyboy)
+ MCFG_VIDEO_EOF(buggyboy)
- MDRV_SPEAKER_STANDARD_STEREO("frontleft", "frontright")
-// MDRV_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
+ MCFG_SPEAKER_STANDARD_STEREO("frontleft", "frontright")
+// MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
- MDRV_SOUND_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
- MDRV_SOUND_CONFIG(buggyboy_ym2149_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.15)
+ MCFG_SOUND_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
+ MCFG_SOUND_CONFIG(buggyboy_ym2149_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.15)
- MDRV_SOUND_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
- MDRV_SOUND_CONFIG(buggyboy_ym2149_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.15)
+ MCFG_SOUND_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
+ MCFG_SOUND_CONFIG(buggyboy_ym2149_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.15)
- MDRV_SOUND_ADD("buggyboy", BUGGYBOY, 0)
- MDRV_SOUND_ROUTE(0, "frontleft", 0.2)
- MDRV_SOUND_ROUTE(1, "frontright", 0.2)
+ MCFG_SOUND_ADD("buggyboy", BUGGYBOY, 0)
+ MCFG_SOUND_ROUTE(0, "frontleft", 0.2)
+ MCFG_SOUND_ROUTE(1, "frontright", 0.2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( buggybjr, driver_device )
- MDRV_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(buggybjr_main)
-// MDRV_WATCHDOG_TIME_INIT(5)
+ MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_CPU_PROGRAM_MAP(buggybjr_main)
+// MCFG_WATCHDOG_TIME_INIT(5)
- MDRV_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MDRV_CPU_PROGRAM_MAP(buggyboy_math)
+ MCFG_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_CPU_PROGRAM_MAP(buggyboy_math)
- MDRV_CPU_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
- MDRV_CPU_PROGRAM_MAP(buggybjr_sound_prg)
- MDRV_CPU_IO_MAP(buggyboy_sound_io)
- MDRV_CPU_PERIODIC_INT(z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
+ MCFG_CPU_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
+ MCFG_CPU_PROGRAM_MAP(buggybjr_sound_prg)
+ MCFG_CPU_IO_MAP(buggyboy_sound_io)
+ MCFG_CPU_PERIODIC_INT(z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
- MDRV_MACHINE_RESET(buggybjr)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(buggybjr)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
+ MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(buggyboy)
- MDRV_VIDEO_START(buggybjr)
- MDRV_VIDEO_UPDATE(buggybjr)
- MDRV_VIDEO_EOF(buggyboy)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(buggyboy)
+ MCFG_VIDEO_START(buggybjr)
+ MCFG_VIDEO_UPDATE(buggybjr)
+ MCFG_VIDEO_EOF(buggyboy)
- MDRV_SPEAKER_STANDARD_STEREO("frontleft", "frontright")
-// MDRV_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
+ MCFG_SPEAKER_STANDARD_STEREO("frontleft", "frontright")
+// MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
- MDRV_SOUND_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
- MDRV_SOUND_CONFIG(buggybjr_ym2149_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.15)
+ MCFG_SOUND_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
+ MCFG_SOUND_CONFIG(buggybjr_ym2149_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.15)
- MDRV_SOUND_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
- MDRV_SOUND_CONFIG(buggybjr_ym2149_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.15)
+ MCFG_SOUND_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
+ MCFG_SOUND_CONFIG(buggybjr_ym2149_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.15)
- MDRV_SOUND_ADD("buggyboy", BUGGYBOY, 0)
- MDRV_SOUND_ROUTE(0, "frontleft", 0.2)
- MDRV_SOUND_ROUTE(1, "frontright", 0.2)
+ MCFG_SOUND_ADD("buggyboy", BUGGYBOY, 0)
+ MCFG_SOUND_ROUTE(0, "frontleft", 0.2)
+ MCFG_SOUND_ROUTE(1, "frontright", 0.2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index 9fa8c9e6851..05dc81fee88 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -185,36 +185,36 @@ static const c6280_interface c6280_config =
static MACHINE_CONFIG_START( uapce, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MDRV_CPU_PROGRAM_MAP(pce_mem)
- MDRV_CPU_IO_MAP(pce_io)
- MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
+ MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
+ MCFG_CPU_PROGRAM_MAP(pce_mem)
+ MCFG_CPU_IO_MAP(pce_io)
+ MCFG_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
- MDRV_CPU_ADD("sub", Z80, 1400000)
- MDRV_CPU_PROGRAM_MAP(z80_map)
+ MCFG_CPU_ADD("sub", Z80, 1400000)
+ MCFG_CPU_PROGRAM_MAP(z80_map)
- MDRV_QUANTUM_TIME(HZ(60))
+ MCFG_QUANTUM_TIME(HZ(60))
- MDRV_MACHINE_RESET( uapce )
+ MCFG_MACHINE_RESET( uapce )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, VDC_WPF, 70, 70 + 512 + 32, VDC_LPF, 14, 14+242)
- /* MDRV_GFXDECODE( pce_gfxdecodeinfo ) */
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT( vce )
+ /* MCFG_GFXDECODE( pce_gfxdecodeinfo ) */
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT( vce )
- MDRV_VIDEO_START( pce )
- MDRV_VIDEO_UPDATE( pce )
+ MCFG_VIDEO_START( pce )
+ MCFG_VIDEO_UPDATE( pce )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MDRV_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
- MDRV_SOUND_CONFIG(c6280_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.00)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
+ MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
+ MCFG_SOUND_CONFIG(c6280_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index 09fc7adc868..22fcc63bd33 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -219,49 +219,49 @@ static MACHINE_RESET( ultraman )
static MACHINE_CONFIG_START( ultraman, ultraman_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,24000000/6) /* 4 MHz? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80,24000000/6) /* 4 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(ultraman)
- MDRV_MACHINE_RESET(ultraman)
+ MCFG_MACHINE_START(ultraman)
+ MCFG_MACHINE_RESET(ultraman)
/* 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ 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(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(ultraman)
- MDRV_VIDEO_UPDATE(ultraman)
+ MCFG_VIDEO_START(ultraman)
+ MCFG_VIDEO_UPDATE(ultraman)
- MDRV_K051960_ADD("k051960", ultraman_k051960_intf)
- MDRV_K051316_ADD("k051316_1", ultraman_k051316_intf_0)
- MDRV_K051316_ADD("k051316_2", ultraman_k051316_intf_1)
- MDRV_K051316_ADD("k051316_3", ultraman_k051316_intf_2)
+ MCFG_K051960_ADD("k051960", ultraman_k051960_intf)
+ MCFG_K051316_ADD("k051316_1", ultraman_k051316_intf_0)
+ MCFG_K051316_ADD("k051316_2", ultraman_k051316_intf_1)
+ MCFG_K051316_ADD("k051316_3", ultraman_k051316_intf_2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 24000000/6)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 24000000/6)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 2f70b93db55..9f5ff9a4675 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -294,31 +294,31 @@ GFXDECODE_END
static MACHINE_CONFIG_START( ultratnk, ultratnk_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
- MDRV_CPU_PROGRAM_MAP(ultratnk_cpu_map)
+ MCFG_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
+ MCFG_CPU_PROGRAM_MAP(ultratnk_cpu_map)
- MDRV_WATCHDOG_VBLANK_INIT(8)
- MDRV_MACHINE_RESET(ultratnk)
+ MCFG_WATCHDOG_VBLANK_INIT(8)
+ MCFG_MACHINE_RESET(ultratnk)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, 256, VTOTAL, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, 256, VTOTAL, 0, 224)
- MDRV_GFXDECODE(ultratnk)
- MDRV_PALETTE_LENGTH(10)
+ MCFG_GFXDECODE(ultratnk)
+ MCFG_PALETTE_LENGTH(10)
- MDRV_PALETTE_INIT(ultratnk)
- MDRV_VIDEO_START(ultratnk)
- MDRV_VIDEO_UPDATE(ultratnk)
- MDRV_VIDEO_EOF(ultratnk)
+ MCFG_PALETTE_INIT(ultratnk)
+ MCFG_VIDEO_START(ultratnk)
+ MCFG_VIDEO_UPDATE(ultratnk)
+ MCFG_VIDEO_EOF(ultratnk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(ultratnk)
- MDRV_SOUND_ROUTE(0, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(ultratnk)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index d36f0a325e4..c8c0460a3bd 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -203,39 +203,39 @@ static const k056800_interface ultrsprt_k056800_interface =
static MACHINE_CONFIG_START( ultrsprt, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GA, 25000000) /* PowerPC 403GA 25MHz */
- MDRV_CPU_PROGRAM_MAP(ultrsprt_map)
- MDRV_CPU_VBLANK_INT("screen", ultrsprt_vblank)
+ MCFG_CPU_ADD("maincpu", PPC403GA, 25000000) /* PowerPC 403GA 25MHz */
+ MCFG_CPU_PROGRAM_MAP(ultrsprt_map)
+ MCFG_CPU_VBLANK_INT("screen", ultrsprt_vblank)
- MDRV_CPU_ADD("audiocpu", M68000, 8000000) /* Not sure about the frequency */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq5_line_hold, 1) // ???
+ MCFG_CPU_ADD("audiocpu", M68000, 8000000) /* Not sure about the frequency */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq5_line_hold, 1) // ???
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_MACHINE_START(ultrsprt)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(ultrsprt)
/* 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, 400)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 399)
+ 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, 400)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 399)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_UPDATE(ultrsprt)
+ MCFG_VIDEO_UPDATE(ultrsprt)
/* sound hardware */
- MDRV_K056800_ADD("k056800", ultrsprt_k056800_interface)
+ MCFG_K056800_ADD("k056800", ultrsprt_k056800_interface)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami", K054539, 48000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("konami", K054539, 48000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index a1ab499a899..25bc8eafd9f 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -717,68 +717,68 @@ static const tc0480scp_interface undrfire_tc0480scp_intf =
static MACHINE_CONFIG_START( undrfire, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(undrfire_map)
- MDRV_CPU_VBLANK_INT("screen", undrfire_interrupt)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(undrfire_map)
+ MCFG_CPU_VBLANK_INT("screen", undrfire_interrupt)
- MDRV_EEPROM_ADD("eeprom", undrfire_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", undrfire_eeprom_interface)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*8, 32*8-1)
- MDRV_GFXDECODE(undrfire)
- MDRV_PALETTE_LENGTH(16384)
+ MCFG_GFXDECODE(undrfire)
+ MCFG_PALETTE_LENGTH(16384)
- MDRV_VIDEO_START(undrfire)
- MDRV_VIDEO_UPDATE(undrfire)
+ MCFG_VIDEO_START(undrfire)
+ MCFG_VIDEO_UPDATE(undrfire)
- MDRV_TC0100SCN_ADD("tc0100scn", undrfire_tc0100scn_intf)
- MDRV_TC0480SCP_ADD("tc0480scp", undrfire_tc0480scp_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", undrfire_tc0100scn_intf)
+ MCFG_TC0480SCP_ADD("tc0480scp", undrfire_tc0480scp_intf)
/* sound hardware */
- MDRV_FRAGMENT_ADD(taito_f3_sound)
+ MCFG_FRAGMENT_ADD(taito_f3_sound)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cbombers, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(cbombers_cpua_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(cbombers_cpua_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("sub", M68000, 16000000) /* 16 MHz */
- MDRV_CPU_PROGRAM_MAP(cbombers_cpub_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("sub", M68000, 16000000) /* 16 MHz */
+ MCFG_CPU_PROGRAM_MAP(cbombers_cpub_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_QUANTUM_TIME(HZ(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
+ MCFG_QUANTUM_TIME(HZ(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
- MDRV_EEPROM_ADD("eeprom", undrfire_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", undrfire_eeprom_interface)
/* 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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 3*8, 32*8-1)
- MDRV_GFXDECODE(cbombers)
- MDRV_PALETTE_LENGTH(16384)
+ MCFG_GFXDECODE(cbombers)
+ MCFG_PALETTE_LENGTH(16384)
- MDRV_VIDEO_START(undrfire)
- MDRV_VIDEO_UPDATE(cbombers)
+ MCFG_VIDEO_START(undrfire)
+ MCFG_VIDEO_UPDATE(cbombers)
- MDRV_TC0100SCN_ADD("tc0100scn", undrfire_tc0100scn_intf)
- MDRV_TC0480SCP_ADD("tc0480scp", undrfire_tc0480scp_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", undrfire_tc0100scn_intf)
+ MCFG_TC0480SCP_ADD("tc0480scp", undrfire_tc0480scp_intf)
/* sound hardware */
- MDRV_FRAGMENT_ADD(taito_f3_sound)
+ MCFG_FRAGMENT_ADD(taito_f3_sound)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index df88c8b7d55..ba565bab2b9 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -604,36 +604,36 @@ static const eeprom_interface zeropnt2_eeprom_interface =
static MACHINE_CONFIG_START( burglarx, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(burglarx_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(burglarx_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_MACHINE_RESET(unico)
+ MCFG_MACHINE_RESET(unico)
/* 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(0x180, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-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(0x180, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-1)
- MDRV_GFXDECODE(unico)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(unico)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(unico)
- MDRV_VIDEO_UPDATE(unico)
+ MCFG_VIDEO_START(unico)
+ MCFG_VIDEO_UPDATE(unico)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -650,36 +650,36 @@ static MACHINE_RESET( zeropt )
static MACHINE_CONFIG_START( zeropnt, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(zeropnt_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(zeropnt_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_MACHINE_RESET(zeropt)
+ MCFG_MACHINE_RESET(zeropt)
/* 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(0x180, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-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(0x180, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-1)
- MDRV_GFXDECODE(unico)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(unico)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(unico)
- MDRV_VIDEO_UPDATE(unico)
+ MCFG_VIDEO_START(unico)
+ MCFG_VIDEO_UPDATE(unico)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -691,40 +691,40 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( zeropnt2, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68EC020, 16000000)
- MDRV_CPU_PROGRAM_MAP(zeropnt2_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
+ MCFG_CPU_PROGRAM_MAP(zeropnt2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_MACHINE_RESET(zeropt)
+ MCFG_MACHINE_RESET(zeropt)
- MDRV_EEPROM_ADD("eeprom", zeropnt2_eeprom_interface)
+ MCFG_EEPROM_ADD("eeprom", zeropnt2_eeprom_interface)
/* 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(0x180, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-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(0x180, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1, 0, 0xe0-1)
- MDRV_GFXDECODE(unico)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(unico)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(zeropnt2)
- MDRV_VIDEO_UPDATE(zeropnt2)
+ MCFG_VIDEO_START(zeropnt2)
+ MCFG_VIDEO_UPDATE(zeropnt2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.70)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.70)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
- MDRV_OKIM6295_ADD("oki1", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_OKIM6295_ADD("oki1", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_OKIM6295_ADD("oki2", 3960000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
+ MCFG_OKIM6295_ADD("oki2", 3960000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 331481f3d37..6b3bccbdd00 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -315,40 +315,40 @@ static const mos6526_interface cia_1_intf =
static MACHINE_CONFIG_START( upscope, upscope_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_RESET(amiga)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(amiga)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.997)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512*2, 262)
- MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.997)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512*2, 262)
+ MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(amiga)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_INIT(amiga)
- MDRV_VIDEO_START(amiga)
- MDRV_VIDEO_UPDATE(amiga)
+ MCFG_VIDEO_START(amiga)
+ MCFG_VIDEO_UPDATE(amiga)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("amiga", AMIGA, 3579545)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("amiga", AMIGA, 3579545)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.50)
/* cia */
- MDRV_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
- MDRV_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
+ MCFG_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
+ MCFG_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index 7322b51439f..13162f3e2da 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -232,39 +232,39 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( usg32, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, 2000000) /* ?? */
- MDRV_CPU_PROGRAM_MAP(usgames_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,5*60) /* ?? */
+ MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(usgames_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,5*60) /* ?? */
- 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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(7*8, 57*8-1, 0*8, 31*8-1)
+ 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(7*8, 57*8-1, 0*8, 31*8-1)
- MDRV_GFXDECODE(usgames)
- MDRV_PALETTE_LENGTH(2*256)
+ MCFG_GFXDECODE(usgames)
+ MCFG_PALETTE_LENGTH(2*256)
- MDRV_PALETTE_INIT(usgames)
- MDRV_VIDEO_START(usgames)
- MDRV_VIDEO_UPDATE(usgames)
+ MCFG_PALETTE_INIT(usgames)
+ MCFG_VIDEO_START(usgames)
+ MCFG_VIDEO_UPDATE(usgames)
- MDRV_MC6845_ADD("crtc", MC6845, XTAL_18MHz / 16, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, XTAL_18MHz / 16, mc6845_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( usg185, usg32 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(usg185_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(usg185_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 6650659c6ce..895b60b8b5c 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -646,170 +646,170 @@ static ADDRESS_MAP_START( qs1000_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_CONFIG_START( common, driver_device )
- MDRV_CPU_ADD("maincpu", E116T, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", E116T, 50000000) /* 50 MHz */
+ MCFG_CPU_PROGRAM_MAP(common_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(31, 350, 16, 255)
+ 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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(31, 350, 16, 255)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_GFXDECODE(vamphalf)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(vamphalf)
- MDRV_VIDEO_UPDATE(common)
+ MCFG_VIDEO_UPDATE(common)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( sound_ym_oki )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 28000000/8)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 28000000/8)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki", 28000000/16 , OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 28000000/16 , OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( sound_suplup )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 14318180/4)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 14318180/4)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki", 1789772.5 , OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1789772.5 , OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( sound_qs1000 )
- MDRV_CPU_ADD("audiocpu", I8052, 24000000/4) /* 6 MHz? */
- MDRV_CPU_PROGRAM_MAP(qs1000_prg_map)
- MDRV_CPU_IO_MAP( qs1000_io_map)
+ MCFG_CPU_ADD("audiocpu", I8052, 24000000/4) /* 6 MHz? */
+ MCFG_CPU_PROGRAM_MAP(qs1000_prg_map)
+ MCFG_CPU_IO_MAP( qs1000_io_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vamphalf, common )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(vamphalf_io)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(vamphalf_io)
- MDRV_FRAGMENT_ADD(sound_ym_oki)
+ MCFG_FRAGMENT_ADD(sound_ym_oki)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( misncrft, common )
- MDRV_CPU_REPLACE("maincpu", GMS30C2116, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_map)
- MDRV_CPU_IO_MAP(misncrft_io)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_REPLACE("maincpu", GMS30C2116, 50000000) /* 50 MHz */
+ MCFG_CPU_PROGRAM_MAP(common_map)
+ MCFG_CPU_IO_MAP(misncrft_io)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_FRAGMENT_ADD(sound_qs1000)
+ MCFG_FRAGMENT_ADD(sound_qs1000)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( coolmini, common )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(coolmini_io)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(coolmini_io)
- MDRV_FRAGMENT_ADD(sound_ym_oki)
+ MCFG_FRAGMENT_ADD(sound_ym_oki)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( suplup, common )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(suplup_io)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(suplup_io)
- MDRV_FRAGMENT_ADD(sound_suplup)
+ MCFG_FRAGMENT_ADD(sound_suplup)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jmpbreak, common )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(jmpbreak_io)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(jmpbreak_io)
- MDRV_FRAGMENT_ADD(sound_ym_oki)
+ MCFG_FRAGMENT_ADD(sound_ym_oki)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mrdig, common )
- MDRV_CPU_REPLACE("maincpu", GMS30C2116, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_map)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(mrdig_io)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_REPLACE("maincpu", GMS30C2116, 50000000) /* 50 MHz */
+ MCFG_CPU_PROGRAM_MAP(common_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(mrdig_io)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_FRAGMENT_ADD(sound_ym_oki)
+ MCFG_FRAGMENT_ADD(sound_ym_oki)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wyvernwg, common )
- MDRV_CPU_REPLACE("maincpu", E132T, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_32bit_map)
- MDRV_CPU_IO_MAP(wyvernwg_io)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_REPLACE("maincpu", E132T, 50000000) /* 50 MHz */
+ MCFG_CPU_PROGRAM_MAP(common_32bit_map)
+ MCFG_CPU_IO_MAP(wyvernwg_io)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_FRAGMENT_ADD(sound_qs1000)
+ MCFG_FRAGMENT_ADD(sound_qs1000)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( finalgdr, common )
- MDRV_CPU_REPLACE("maincpu", E132T, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_32bit_map)
- MDRV_CPU_IO_MAP(finalgdr_io)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_REPLACE("maincpu", E132T, 50000000) /* 50 MHz */
+ MCFG_CPU_PROGRAM_MAP(common_32bit_map)
+ MCFG_CPU_IO_MAP(finalgdr_io)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_FRAGMENT_ADD(sound_ym_oki)
+ MCFG_FRAGMENT_ADD(sound_ym_oki)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mrkicker, common )
- MDRV_CPU_REPLACE("maincpu", E132T, 50000000) /* 50 MHz */
- MDRV_CPU_PROGRAM_MAP(common_32bit_map)
- MDRV_CPU_IO_MAP(mrkicker_io)
+ MCFG_CPU_REPLACE("maincpu", E132T, 50000000) /* 50 MHz */
+ MCFG_CPU_PROGRAM_MAP(common_32bit_map)
+ MCFG_CPU_IO_MAP(mrkicker_io)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_FRAGMENT_ADD(sound_ym_oki)
+ MCFG_FRAGMENT_ADD(sound_ym_oki)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( aoh, driver_device )
- MDRV_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
- MDRV_CPU_PROGRAM_MAP(aoh_map)
- MDRV_CPU_IO_MAP(aoh_io)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
+ MCFG_CPU_PROGRAM_MAP(aoh_map)
+ MCFG_CPU_IO_MAP(aoh_io)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.185)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(64, 511-64, 16, 255-16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.185)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(64, 511-64, 16, 255-16)
- MDRV_PALETTE_LENGTH(0x8000)
- MDRV_GFXDECODE(vamphalf)
+ MCFG_PALETTE_LENGTH(0x8000)
+ MCFG_GFXDECODE(vamphalf)
- MDRV_VIDEO_UPDATE(aoh)
+ MCFG_VIDEO_UPDATE(aoh)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki_1", 32000000/8, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki_1", 32000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki_2", 32000000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki_2", 32000000/32, OKIM6295_PIN7_HIGH)
+ 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/vaportra.c b/src/mame/drivers/vaportra.c
index a1122b37d98..fb0d3c68ec3 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -252,48 +252,48 @@ static MACHINE_RESET( vaportra )
static MACHINE_CONFIG_START( vaportra, vaportra_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,12000000) /* Custom chip 59 */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,12000000) /* Custom chip 59 */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("audiocpu", H6280, 32220000/4) /* Custom chip 45; Audio section crystal is 32.220 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", H6280, 32220000/4) /* Custom chip 45; Audio section crystal is 32.220 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(vaportra)
- MDRV_MACHINE_RESET(vaportra)
+ MCFG_MACHINE_START(vaportra)
+ MCFG_MACHINE_RESET(vaportra)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(58)
- 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(vaportra)
- MDRV_PALETTE_LENGTH(1280)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(58)
+ 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(vaportra)
+ MCFG_PALETTE_LENGTH(1280)
- MDRV_VIDEO_UPDATE(vaportra)
+ MCFG_VIDEO_UPDATE(vaportra)
- MDRV_DECO16IC_ADD("deco_custom", vaportra_deco16ic_intf)
+ MCFG_DECO16IC_ADD("deco_custom", vaportra_deco16ic_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("ym1", YM2203, 32220000/8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ym2", YM2151, 32220000/9)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MDRV_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index c9f2059c206..3aacd9031c1 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -295,41 +295,41 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( vastar, vastar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_port_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_port_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("sub", Z80, 3072000) /* 3.072 MHz ???? */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_IO_MAP(cpu2_port_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ??? */
+ MCFG_CPU_ADD("sub", Z80, 3072000) /* 3.072 MHz ???? */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_IO_MAP(cpu2_port_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ??? */
- MDRV_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - seems enough to ensure proper */
+ MCFG_QUANTUM_TIME(HZ(600)) /* 10 CPU slices per frame - seems enough to ensure proper */
/* synchronization of the CPUs */
- MDRV_MACHINE_RESET(vastar)
+ MCFG_MACHINE_RESET(vastar)
/* 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)
+ 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)
- MDRV_GFXDECODE(vastar)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(vastar)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(vastar)
- MDRV_VIDEO_UPDATE(vastar)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(vastar)
+ MCFG_VIDEO_UPDATE(vastar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index e5081c879de..a08530e40c0 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -418,36 +418,36 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( vball, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", vball_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", vball_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 8, 248) /* based on ddragon driver */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 8, 248) /* based on ddragon driver */
- MDRV_GFXDECODE(vb)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(vb)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(vb)
- MDRV_VIDEO_UPDATE(vb)
+ MCFG_VIDEO_START(vb)
+ MCFG_VIDEO_UPDATE(vb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ 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/vcombat.c b/src/mame/drivers/vcombat.c
index 18330e892bd..7258e3cbd3d 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -548,85 +548,85 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( vcombat, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_assert)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_assert)
/* The middle board i860 */
- MDRV_CPU_ADD("vid_0", I860, XTAL_20MHz)
- MDRV_CPU_PROGRAM_MAP(vid_0_map)
+ MCFG_CPU_ADD("vid_0", I860, XTAL_20MHz)
+ MCFG_CPU_PROGRAM_MAP(vid_0_map)
/* The top board i860 */
- MDRV_CPU_ADD("vid_1", I860, XTAL_20MHz)
- MDRV_CPU_PROGRAM_MAP(vid_1_map)
+ MCFG_CPU_ADD("vid_1", I860, XTAL_20MHz)
+ MCFG_CPU_PROGRAM_MAP(vid_1_map)
/* Sound CPU */
- MDRV_CPU_ADD("soundcpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, 15000) /* Remove this if MC6845 is enabled */
+ MCFG_CPU_ADD("soundcpu", M68000, XTAL_12MHz)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, 15000) /* Remove this if MC6845 is enabled */
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_RESET(vcombat)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(vcombat)
/* Temporary hack for experimenting with timing. */
#if 0
- //MDRV_QUANTUM_TIME(HZ(1200))
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ //MCFG_QUANTUM_TIME(HZ(1200))
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
#endif
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
/* Disabled for now as it can't handle multiple screens */
-// MDRV_MC6845_ADD("crtc", MC6845, 6000000 / 16, mc6845_intf)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+// MCFG_MC6845_ADD("crtc", MC6845, 6000000 / 16, mc6845_intf)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(XTAL_12MHz / 2, 400, 0, 256, 291, 0, 208)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz / 2, 400, 0, 256, 291, 0, 208)
- MDRV_SCREEN_ADD("aux", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(XTAL_12MHz / 2, 400, 0, 256, 291, 0, 208)
+ MCFG_SCREEN_ADD("aux", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_12MHz / 2, 400, 0, 256, 291, 0, 208)
- MDRV_VIDEO_UPDATE(vcombat)
+ MCFG_VIDEO_UPDATE(vcombat)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( shadfgtr, driver_device )
- MDRV_CPU_ADD("maincpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_assert)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_assert)
/* The middle board i860 */
- MDRV_CPU_ADD("vid_0", I860, XTAL_20MHz)
- MDRV_CPU_PROGRAM_MAP(vid_0_map)
+ MCFG_CPU_ADD("vid_0", I860, XTAL_20MHz)
+ MCFG_CPU_PROGRAM_MAP(vid_0_map)
/* Sound CPU */
- MDRV_CPU_ADD("soundcpu", M68000, XTAL_12MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("soundcpu", M68000, XTAL_12MHz)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
- MDRV_MACHINE_RESET(shadfgtr)
+ MCFG_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(shadfgtr)
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_MC6845_ADD("crtc", MC6845, XTAL_20MHz / 4 / 16, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, XTAL_20MHz / 4 / 16, mc6845_intf)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(XTAL_20MHz / 4, 320, 0, 256, 277, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_20MHz / 4, 320, 0, 256, 277, 0, 224)
- MDRV_VIDEO_UPDATE(vcombat)
+ MCFG_VIDEO_UPDATE(vcombat)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c
index 06b6e8bcf3b..61a23edfc3a 100644
--- a/src/mame/drivers/vega.c
+++ b/src/mame/drivers/vega.c
@@ -36,21 +36,21 @@ static VIDEO_UPDATE(vega)
}
static MACHINE_CONFIG_START( vega, driver_device )
- MDRV_CPU_ADD("maincpu", I8035, 6000000) // what CPU? what speed?
- MDRV_CPU_PROGRAM_MAP(vega_map)
+ MCFG_CPU_ADD("maincpu", I8035, 6000000) // what CPU? what speed?
+ MCFG_CPU_PROGRAM_MAP(vega_map)
/* 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(0*8, 32*8-1, 0*8, 28*8-1)
+ 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(0*8, 32*8-1, 0*8, 28*8-1)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(vega)
- MDRV_VIDEO_UPDATE(vega)
+ MCFG_PALETTE_INIT(vega)
+ MCFG_VIDEO_UPDATE(vega)
MACHINE_CONFIG_END
ROM_START( vega )
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index dafa816e97e..1edfa7ccc4e 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -163,27 +163,27 @@ static VIDEO_UPDATE( vega )
static MACHINE_CONFIG_START( vega, driver_device )
- MDRV_CPU_ADD("maincpu", GMS30C2132, 55000000) /* 55 MHz */
- MDRV_CPU_PROGRAM_MAP(vega_map)
- MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
+ MCFG_CPU_ADD("maincpu", GMS30C2132, 55000000) /* 55 MHz */
+ MCFG_CPU_PROGRAM_MAP(vega_map)
+ MCFG_CPU_VBLANK_INT_HACK(eolith_speedup,262)
/* sound cpu */
/* 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, 512)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ 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, 512)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(vega)
- MDRV_VIDEO_UPDATE(vega)
+ MCFG_VIDEO_START(vega)
+ MCFG_VIDEO_UPDATE(vega)
/* sound hardware */
- MDRV_AT28C16_ADD( "at28c16", NULL )
+ MCFG_AT28C16_ADD( "at28c16", NULL )
MACHINE_CONFIG_END
/*
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index 1ad3da265b9..fd104d074dc 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -2223,93 +2223,93 @@ static const mips3_config r5000_config =
static MACHINE_CONFIG_START( vegascore, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*2)
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(vegas_map_8mb)
+ MCFG_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*2)
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(vegas_map_8mb)
- MDRV_MACHINE_START(vegas)
- MDRV_MACHINE_RESET(vegas)
- MDRV_NVRAM_HANDLER(timekeeper_save)
+ MCFG_MACHINE_START(vegas)
+ MCFG_MACHINE_RESET(vegas)
+ MCFG_NVRAM_HANDLER(timekeeper_save)
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
- MDRV_IDE_BUS_MASTER_SPACE("maincpu", PROGRAM)
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_IDE_BUS_MASTER_SPACE("maincpu", PROGRAM)
- MDRV_SMC91C94_ADD("ethernet", ethernet_interrupt)
+ MCFG_SMC91C94_ADD("ethernet", ethernet_interrupt)
- MDRV_3DFX_VOODOO_2_ADD("voodoo", STD_VOODOO_2_CLOCK, 2, "screen")
- MDRV_3DFX_VOODOO_CPU("maincpu")
- MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4)
- MDRV_3DFX_VOODOO_TMU_MEMORY(1, 4)
- MDRV_3DFX_VOODOO_VBLANK(vblank_assert)
+ MCFG_3DFX_VOODOO_2_ADD("voodoo", STD_VOODOO_2_CLOCK, 2, "screen")
+ MCFG_3DFX_VOODOO_CPU("maincpu")
+ MCFG_3DFX_VOODOO_TMU_MEMORY(0, 4)
+ MCFG_3DFX_VOODOO_TMU_MEMORY(1, 4)
+ MCFG_3DFX_VOODOO_VBLANK(vblank_assert)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
- MDRV_VIDEO_UPDATE(vegas)
+ MCFG_VIDEO_UPDATE(vegas)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vegas, vegascore )
- MDRV_FRAGMENT_ADD(dcs2_audio_2104)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2104)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vegas250, vegascore )
- MDRV_FRAGMENT_ADD(dcs2_audio_2104)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2104)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(SYSTEM_CLOCK*2.5)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(SYSTEM_CLOCK*2.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vegas32m, vegascore )
- MDRV_FRAGMENT_ADD(dcs2_audio_dsio)
+ MCFG_FRAGMENT_ADD(dcs2_audio_dsio)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vegas_map_32mb)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(vegas_map_32mb)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vegasban, vegascore )
- MDRV_FRAGMENT_ADD(dcs2_audio_2104)
+ MCFG_FRAGMENT_ADD(dcs2_audio_2104)
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vegas_map_32mb)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(vegas_map_32mb)
- MDRV_DEVICE_REMOVE("voodoo")
- MDRV_3DFX_VOODOO_BANSHEE_ADD("voodoo", STD_VOODOO_BANSHEE_CLOCK, 16, "screen")
- MDRV_3DFX_VOODOO_CPU("maincpu")
- MDRV_3DFX_VOODOO_VBLANK(vblank_assert)
+ MCFG_DEVICE_REMOVE("voodoo")
+ MCFG_3DFX_VOODOO_BANSHEE_ADD("voodoo", STD_VOODOO_BANSHEE_CLOCK, 16, "screen")
+ MCFG_3DFX_VOODOO_CPU("maincpu")
+ MCFG_3DFX_VOODOO_VBLANK(vblank_assert)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vegasv3, vegas32m )
- MDRV_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5)
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(vegas_map_8mb)
-
- MDRV_DEVICE_REMOVE("voodoo")
- MDRV_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, 16, "screen")
- MDRV_3DFX_VOODOO_CPU("maincpu")
- MDRV_3DFX_VOODOO_VBLANK(vblank_assert)
+ MCFG_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5)
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(vegas_map_8mb)
+
+ MCFG_DEVICE_REMOVE("voodoo")
+ MCFG_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, 16, "screen")
+ MCFG_3DFX_VOODOO_CPU("maincpu")
+ MCFG_3DFX_VOODOO_VBLANK(vblank_assert)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( denver, vegascore )
- MDRV_FRAGMENT_ADD(dcs2_audio_denver)
+ MCFG_FRAGMENT_ADD(dcs2_audio_denver)
- MDRV_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5)
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(vegas_map_32mb)
+ MCFG_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5)
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(vegas_map_32mb)
- MDRV_DEVICE_REMOVE("voodoo")
- MDRV_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, 16, "screen")
- MDRV_3DFX_VOODOO_CPU("maincpu")
- MDRV_3DFX_VOODOO_VBLANK(vblank_assert)
+ MCFG_DEVICE_REMOVE("voodoo")
+ MCFG_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, 16, "screen")
+ MCFG_3DFX_VOODOO_CPU("maincpu")
+ MCFG_3DFX_VOODOO_VBLANK(vblank_assert)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index 8b43e3ba7bf..2e390b07958 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -500,67 +500,67 @@ static MACHINE_RESET( vendetta )
static MACHINE_CONFIG_START( vendetta, vendetta_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 6000000) /* this is strange, seems an overclock but */
-// MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* is needed to have correct music speed */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", vendetta_irq)
+ MCFG_CPU_ADD("maincpu", KONAMI, 6000000) /* this is strange, seems an overclock but */
+// MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* is needed to have correct music speed */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", vendetta_irq)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* verified with PCB */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* verified with PCB */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* interrupts are triggered by the main CPU */
- MDRV_MACHINE_START(vendetta)
- MDRV_MACHINE_RESET(vendetta)
+ MCFG_MACHINE_START(vendetta)
+ MCFG_MACHINE_RESET(vendetta)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* 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(2500) /* not accurate */)
- 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 )
+ 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(13*8, (64-13)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(vendetta)
+ MCFG_VIDEO_UPDATE(vendetta)
- MDRV_K052109_ADD("k052109", vendetta_k052109_intf)
- MDRV_K053246_ADD("k053246", vendetta_k053246_intf)
- MDRV_K053251_ADD("k053251")
- MDRV_K054000_ADD("k054000")
+ MCFG_K052109_ADD("k052109", vendetta_k052109_intf)
+ MCFG_K053246_ADD("k053246", vendetta_k053246_intf)
+ MCFG_K053251_ADD("k053251")
+ MCFG_K054000_ADD("k054000")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545) /* verified with PCB */
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545) /* verified with PCB */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, 3579545) /* verified with PCB */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("k053260", K053260, 3579545) /* verified with PCB */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( esckids, vendetta )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(esckids_map)
-
- MDRV_SCREEN_MODIFY("screen")
-//MDRV_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) /* black areas on the edges */
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
-
- MDRV_DEVICE_REMOVE("k054000")
- MDRV_DEVICE_REMOVE("k052109")
- MDRV_K052109_ADD("k052109", esckids_k052109_intf)
- MDRV_DEVICE_REMOVE("k053246")
- MDRV_K053246_ADD("k053246", esckids_k053246_intf)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(esckids_map)
+
+ MCFG_SCREEN_MODIFY("screen")
+//MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) /* black areas on the edges */
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+
+ MCFG_DEVICE_REMOVE("k054000")
+ MCFG_DEVICE_REMOVE("k052109")
+ MCFG_K052109_ADD("k052109", esckids_k052109_intf)
+ MCFG_DEVICE_REMOVE("k053246")
+ MCFG_K053246_ADD("k053246", esckids_k053246_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index 083222ba9c1..34973744531 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -108,33 +108,33 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( vertigo, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(vertigo_map)
- MDRV_CPU_PERIODIC_INT(vertigo_interrupt,60)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(vertigo_map)
+ MCFG_CPU_PERIODIC_INT(vertigo_interrupt,60)
- MDRV_FRAGMENT_ADD(exidy440_audio)
+ MCFG_FRAGMENT_ADD(exidy440_audio)
- MDRV_PIT8254_ADD( "pit8254", vertigo_pit8254_config )
+ MCFG_PIT8254_ADD( "pit8254", vertigo_pit8254_config )
- MDRV_74148_ADD( "74148", vertigo_update_irq )
+ MCFG_74148_ADD( "74148", vertigo_update_irq )
/* motor controller */
/*
- MDRV_CPU_ADD("motor", M6805, 1000000)
- MDRV_CPU_PROGRAM_MAP(vertigo_motor)
+ MCFG_CPU_ADD("motor", M6805, 1000000)
+ MCFG_CPU_PROGRAM_MAP(vertigo_motor)
*/
- MDRV_MACHINE_START(vertigo)
- MDRV_MACHINE_RESET(vertigo)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(vertigo)
+ MCFG_MACHINE_RESET(vertigo)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(400, 300)
- MDRV_SCREEN_VISIBLE_AREA(0, 510, 0, 400)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(400, 300)
+ MCFG_SCREEN_VISIBLE_AREA(0, 510, 0, 400)
- MDRV_VIDEO_START(vector)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(vector)
+ MCFG_VIDEO_UPDATE(vector)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index d35d2f68ef3..5fc4a67ad63 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -229,12 +229,12 @@ UINT8 vicdual_characterram_r(offs_t offset)
static MACHINE_CONFIG_START( vicdual_root, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK)
+ MCFG_CPU_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(VICDUAL_PIXEL_CLOCK, VICDUAL_HTOTAL, VICDUAL_HBEND, VICDUAL_HBSTART, VICDUAL_VTOTAL, VICDUAL_VBEND, VICDUAL_VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(VICDUAL_PIXEL_CLOCK, VICDUAL_HTOTAL, VICDUAL_HBEND, VICDUAL_HBSTART, VICDUAL_VTOTAL, VICDUAL_VBEND, VICDUAL_VBSTART)
MACHINE_CONFIG_END
@@ -306,16 +306,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( depthch, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu", I8080, VICDUAL_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(depthch_map)
- MDRV_CPU_IO_MAP(depthch_io_map)
+ MCFG_CPU_REPLACE("maincpu", I8080, VICDUAL_MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(depthch_map)
+ MCFG_CPU_IO_MAP(depthch_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_bw)
+ MCFG_VIDEO_UPDATE(vicdual_bw)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(depthch_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(depthch_audio)
MACHINE_CONFIG_END
@@ -393,12 +393,12 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( safari, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(safari_map)
- MDRV_CPU_IO_MAP(safari_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(safari_map)
+ MCFG_CPU_IO_MAP(safari_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_bw)
+ MCFG_VIDEO_UPDATE(vicdual_bw)
MACHINE_CONFIG_END
@@ -494,17 +494,17 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( frogs, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(frogs_map)
- MDRV_CPU_IO_MAP(frogs_io_map)
- MDRV_MACHINE_START(frogs_audio)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(frogs_map)
+ MCFG_CPU_IO_MAP(frogs_io_map)
+ MCFG_MACHINE_START(frogs_audio)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_bw)
+ MCFG_VIDEO_UPDATE(vicdual_bw)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(frogs_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(frogs_audio)
MACHINE_CONFIG_END
@@ -682,23 +682,23 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( headon, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(headon_map)
- MDRV_CPU_IO_MAP(headon_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(headon_map)
+ MCFG_CPU_IO_MAP(headon_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_bw_or_color)
+ MCFG_VIDEO_UPDATE(vicdual_bw_or_color)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(headon_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(headon_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( headons, headon )
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_bw) // no colour prom on PCB, must be bw?
+ MCFG_VIDEO_UPDATE(vicdual_bw) // no colour prom on PCB, must be bw?
MACHINE_CONFIG_END
@@ -706,12 +706,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sspaceat, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(headon_map)
- MDRV_CPU_IO_MAP(sspaceat_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(headon_map)
+ MCFG_CPU_IO_MAP(sspaceat_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_bw_or_color)
+ MCFG_VIDEO_UPDATE(vicdual_bw_or_color)
MACHINE_CONFIG_END
@@ -899,16 +899,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( headon2, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(headon2_map)
- MDRV_CPU_IO_MAP(headon2_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(headon2_map)
+ MCFG_CPU_IO_MAP(headon2_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_color)
+ MCFG_VIDEO_UPDATE(vicdual_color)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(headon_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(headon_audio)
MACHINE_CONFIG_END
@@ -916,19 +916,19 @@ static MACHINE_CONFIG_DERIVED( headon2bw, headon2 )
/* basic machine hardware */
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_bw)
+ MCFG_VIDEO_UPDATE(vicdual_bw)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( digger, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(headon2_map)
- MDRV_CPU_IO_MAP(digger_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(headon2_map)
+ MCFG_CPU_IO_MAP(digger_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_color)
+ MCFG_VIDEO_UPDATE(vicdual_color)
MACHINE_CONFIG_END
@@ -1907,11 +1907,11 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( vicdual_dualgame_root, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(vicdual_dualgame_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(vicdual_dualgame_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_color)
+ MCFG_VIDEO_UPDATE(vicdual_color)
MACHINE_CONFIG_END
@@ -1919,13 +1919,13 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( invho2, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invho2_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(invho2_io_map)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(invinco_audio)
- MDRV_FRAGMENT_ADD(headon_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(invinco_audio)
+ MCFG_FRAGMENT_ADD(headon_audio)
MACHINE_CONFIG_END
@@ -1933,12 +1933,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( invds, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invds_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(invds_io_map)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(invinco_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(invinco_audio)
MACHINE_CONFIG_END
@@ -1946,20 +1946,20 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sspacaho, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(sspacaho_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(sspacaho_io_map)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(headon_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(headon_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spacetrk, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(spacetrk_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(spacetrk_io_map)
MACHINE_CONFIG_END
@@ -1967,24 +1967,24 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( carnival, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(carnival_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(carnival_io_map)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(carnival_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(carnival_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( carnivalh, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(headon_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(headon_io_map)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(carnival_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(carnival_audio)
MACHINE_CONFIG_END
@@ -1993,8 +1993,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tranqgun, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(tranqgun_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(tranqgun_io_map)
MACHINE_CONFIG_END
@@ -2002,8 +2002,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( brdrline, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(brdrline_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(brdrline_io_map)
MACHINE_CONFIG_END
@@ -2011,12 +2011,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pulsar, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(pulsar_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(pulsar_io_map)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(pulsar_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(pulsar_audio)
MACHINE_CONFIG_END
@@ -2024,8 +2024,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( heiankyo, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(heiankyo_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(heiankyo_io_map)
MACHINE_CONFIG_END
@@ -2033,8 +2033,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( alphaho, vicdual_dualgame_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(alphaho_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(alphaho_io_map)
MACHINE_CONFIG_END
@@ -2154,12 +2154,12 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( samurai, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(samurai_map)
- MDRV_CPU_IO_MAP(samurai_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(samurai_map)
+ MCFG_CPU_IO_MAP(samurai_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_color)
+ MCFG_VIDEO_UPDATE(vicdual_color)
MACHINE_CONFIG_END
@@ -2252,12 +2252,12 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( nsub, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(nsub_map)
- MDRV_CPU_IO_MAP(nsub_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(nsub_map)
+ MCFG_CPU_IO_MAP(nsub_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_color)
+ MCFG_VIDEO_UPDATE(vicdual_color)
MACHINE_CONFIG_END
@@ -2350,16 +2350,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( invinco, vicdual_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(invinco_map)
- MDRV_CPU_IO_MAP(invinco_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(invinco_map)
+ MCFG_CPU_IO_MAP(invinco_io_map)
/* video hardware */
- MDRV_VIDEO_UPDATE(vicdual_color)
+ MCFG_VIDEO_UPDATE(vicdual_color)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(invinco_audio)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(invinco_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index b9b95d0a3d0..c9f5ab333c9 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -211,28 +211,28 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( victory, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, VICTORY_MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", victory_vblank_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, VICTORY_MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", victory_vblank_interrupt)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_ALWAYS_UPDATE)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* using the standard Exidy video parameters for now, needs to be confirmed */
- MDRV_SCREEN_RAW_PARAMS(EXIDY_PIXEL_CLOCK, EXIDY_HTOTAL, EXIDY_HBEND, EXIDY_HBSTART, EXIDY_VTOTAL, EXIDY_VBEND, EXIDY_VBSTART)
+ MCFG_SCREEN_RAW_PARAMS(EXIDY_PIXEL_CLOCK, EXIDY_HTOTAL, EXIDY_HBEND, EXIDY_HBSTART, EXIDY_VTOTAL, EXIDY_VBEND, EXIDY_VBSTART)
- MDRV_PALETTE_LENGTH(64)
+ MCFG_PALETTE_LENGTH(64)
- MDRV_VIDEO_START(victory)
- MDRV_VIDEO_UPDATE(victory)
+ MCFG_VIDEO_START(victory)
+ MCFG_VIDEO_UPDATE(victory)
/* audio hardware */
- MDRV_FRAGMENT_ADD(victory_audio)
+ MCFG_FRAGMENT_ADD(victory_audio)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 41da39062dc..90ef09c156d 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -324,31 +324,31 @@ GFXDECODE_END
static MACHINE_CONFIG_START( videopin, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_RESET(videopin)
+ MCFG_MACHINE_RESET(videopin)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(304, 263)
- MDRV_SCREEN_VISIBLE_AREA(0, 303, 0, 255)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(304, 263)
+ MCFG_SCREEN_VISIBLE_AREA(0, 303, 0, 255)
- MDRV_GFXDECODE(videopin)
- MDRV_PALETTE_LENGTH(2)
+ MCFG_GFXDECODE(videopin)
+ MCFG_PALETTE_LENGTH(2)
- MDRV_PALETTE_INIT(black_and_white)
- MDRV_VIDEO_START(videopin)
- MDRV_VIDEO_UPDATE(videopin)
+ MCFG_PALETTE_INIT(black_and_white)
+ MCFG_VIDEO_START(videopin)
+ MCFG_VIDEO_UPDATE(videopin)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(videopin)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(videopin)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c
index b3674bc5b9a..8e7dbd1992c 100644
--- a/src/mame/drivers/videopkr.c
+++ b/src/mame/drivers/videopkr.c
@@ -1178,39 +1178,39 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( videopkr, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8039, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(i8039_map)
- MDRV_CPU_IO_MAP(i8039_io_port)
+ MCFG_CPU_ADD("maincpu", I8039, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(i8039_map)
+ MCFG_CPU_IO_MAP(i8039_io_port)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_CPU_ADD("soundcpu", I8039, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(i8039_sound_mem)
- MDRV_CPU_IO_MAP(i8039_sound_port)
- MDRV_MACHINE_START(videopkr)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_CPU_ADD("soundcpu", I8039, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(i8039_sound_mem)
+ MCFG_CPU_IO_MAP(i8039_sound_port)
+ MCFG_MACHINE_START(videopkr)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_TIMER_ADD_PERIODIC("t1_timer", sound_t1_callback, HZ(50))
+ MCFG_TIMER_ADD_PERIODIC("t1_timer", sound_t1_callback, HZ(50))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(5*8, 31*8-1, 3*8, 29*8-1)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(5*8, 31*8-1, 3*8, 29*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(2080)
- MDRV_GFXDECODE(videopkr)
- MDRV_PALETTE_INIT(videopkr)
- MDRV_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(videopkr)
- MDRV_VIDEO_UPDATE(videopkr)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(2080)
+ MCFG_GFXDECODE(videopkr)
+ MCFG_PALETTE_INIT(videopkr)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_VIDEO_START(videopkr)
+ MCFG_VIDEO_UPDATE(videopkr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.55)
MACHINE_CONFIG_END
@@ -1219,59 +1219,59 @@ static MACHINE_CONFIG_DERIVED( blckjack, videopkr )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(4*8, 31*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(4*8, 31*8-1, 2*8, 30*8-1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( videodad, videopkr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(CPU_CLOCK_ALT)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(CPU_CLOCK_ALT)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(32*16, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(4*16, 31*16-1, 2*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(32*16, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(4*16, 31*16-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(videodad)
- MDRV_VIDEO_START(vidadcba)
+ MCFG_GFXDECODE(videodad)
+ MCFG_VIDEO_START(vidadcba)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( babypkr, videopkr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(CPU_CLOCK_ALT)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(CPU_CLOCK_ALT)
/* most likely romless or eprom */
- MDRV_CPU_REPLACE("soundcpu", I8031, CPU_CLOCK )
- MDRV_CPU_PROGRAM_MAP(i8051_sound_mem)
- MDRV_CPU_IO_MAP(i8051_sound_port)
+ MCFG_CPU_REPLACE("soundcpu", I8031, CPU_CLOCK )
+ MCFG_CPU_PROGRAM_MAP(i8051_sound_mem)
+ MCFG_CPU_IO_MAP(i8051_sound_port)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE(32*16, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(5*16, 31*16-1, 3*8, 29*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE(32*16, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(5*16, 31*16-1, 3*8, 29*8-1)
- MDRV_PALETTE_INIT(babypkr)
- MDRV_GFXDECODE(videodad)
- MDRV_VIDEO_START(vidadcba)
+ MCFG_PALETTE_INIT(babypkr)
+ MCFG_GFXDECODE(videodad)
+ MCFG_VIDEO_START(vidadcba)
- MDRV_SOUND_ADD("aysnd", AY8910, CPU_CLOCK / 6)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("aysnd", AY8910, CPU_CLOCK / 6)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fortune1, videopkr )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_CLOCK(CPU_CLOCK_ALT)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_CLOCK(CPU_CLOCK_ALT)
- MDRV_PALETTE_INIT(fortune1)
+ MCFG_PALETTE_INIT(fortune1)
MACHINE_CONFIG_END
/*************************
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 410494f946f..b6f1ffe018f 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -516,149 +516,149 @@ static const ym2203_interface ym2203_config =
static MACHINE_CONFIG_START( vigilant, vigilant_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
- MDRV_CPU_PROGRAM_MAP(vigilant_map)
- MDRV_CPU_IO_MAP(vigilant_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- MDRV_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
+ MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
+ MCFG_CPU_PROGRAM_MAP(vigilant_map)
+ MCFG_CPU_IO_MAP(vigilant_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ MCFG_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- 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(16*8, (64-16)*8-1, 0*8, 32*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ 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(16*8, (64-16)*8-1, 0*8, 32*8-1 )
- MDRV_GFXDECODE(vigilant)
- MDRV_PALETTE_LENGTH(512+32) /* 512 real palette, 32 virtual palette */
+ MCFG_GFXDECODE(vigilant)
+ MCFG_PALETTE_LENGTH(512+32) /* 512 real palette, 32 virtual palette */
- MDRV_VIDEO_START(vigilant)
- MDRV_VIDEO_RESET(vigilant)
- MDRV_VIDEO_UPDATE(vigilant)
+ MCFG_VIDEO_START(vigilant)
+ MCFG_VIDEO_RESET(vigilant)
+ MCFG_VIDEO_UPDATE(vigilant)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579645)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.55)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.55)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579645)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.55)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.55)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( buccanrs, vigilant_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */
- MDRV_CPU_PROGRAM_MAP(vigilant_map)
- MDRV_CPU_IO_MAP(vigilant_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- MDRV_CPU_ADD("soundcpu", Z80, 18432000/6) /* 3.072000 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(buccanrs_sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
+ MCFG_CPU_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */
+ MCFG_CPU_PROGRAM_MAP(vigilant_map)
+ MCFG_CPU_IO_MAP(vigilant_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ MCFG_CPU_ADD("soundcpu", Z80, 18432000/6) /* 3.072000 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(buccanrs_sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- 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(16*8, (64-16)*8-1, 0*8, 32*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ 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(16*8, (64-16)*8-1, 0*8, 32*8-1 )
- MDRV_GFXDECODE(buccanrs)
- MDRV_PALETTE_LENGTH(512+32) /* 512 real palette, 32 virtual palette */
+ MCFG_GFXDECODE(buccanrs)
+ MCFG_PALETTE_LENGTH(512+32) /* 512 real palette, 32 virtual palette */
- MDRV_VIDEO_START(vigilant)
- MDRV_VIDEO_RESET(vigilant)
- MDRV_VIDEO_UPDATE(vigilant)
+ MCFG_VIDEO_START(vigilant)
+ MCFG_VIDEO_RESET(vigilant)
+ MCFG_VIDEO_UPDATE(vigilant)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ym1", YM2203, 18432000/6)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.35)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.35)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.50)
-
- MDRV_SOUND_ADD("ym2", YM2203, 18432000/6)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.35)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.35)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.50)
-
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 18432000/6)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.35)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.50)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 18432000/6)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.35)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.50)
+
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kikcubic, vigilant_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
- MDRV_CPU_PROGRAM_MAP(kikcubic_map)
- MDRV_CPU_IO_MAP(kikcubic_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
-
- MDRV_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
+ MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
+ MCFG_CPU_PROGRAM_MAP(kikcubic_map)
+ MCFG_CPU_IO_MAP(kikcubic_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+
+ MCFG_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
- MDRV_SOUND_START(m72)
- MDRV_SOUND_RESET(m72)
+ MCFG_SOUND_START(m72)
+ MCFG_SOUND_RESET(m72)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- 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(8*8, (64-8)*8-1, 0*8, 32*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ 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(8*8, (64-8)*8-1, 0*8, 32*8-1 )
- MDRV_GFXDECODE(kikcubic)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(kikcubic)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(vigilant)
- MDRV_VIDEO_RESET(vigilant)
- MDRV_VIDEO_UPDATE(kikcubic)
+ MCFG_VIDEO_START(vigilant)
+ MCFG_VIDEO_RESET(vigilant)
+ MCFG_VIDEO_UPDATE(kikcubic)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579645)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.55)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.55)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579645)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.55)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.55)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ 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/vindictr.c b/src/mame/drivers/vindictr.c
index 12d13e24bdd..a8dfc124954 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -196,29 +196,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( vindictr, vindictr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(vindictr)
- MDRV_MACHINE_RESET(vindictr)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(vindictr)
+ MCFG_MACHINE_RESET(vindictr)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(vindictr)
- MDRV_PALETTE_LENGTH(2048*8)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(vindictr)
+ MCFG_PALETTE_LENGTH(2048*8)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a SYNGEN chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(vindictr)
- MDRV_VIDEO_UPDATE(vindictr)
+ MCFG_VIDEO_START(vindictr)
+ MCFG_VIDEO_UPDATE(vindictr)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_i_stereo_pokey)
+ MCFG_FRAGMENT_ADD(jsa_i_stereo_pokey)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index 6211bf352a3..f917d1926f6 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -617,36 +617,36 @@ static MACHINE_RESET(viper)
static MACHINE_CONFIG_START( viper, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", MPC8240, 200000000)
- MDRV_CPU_CONFIG(viper_ppc_cfg)
- MDRV_CPU_PROGRAM_MAP(viper_map)
- MDRV_CPU_VBLANK_INT("screen", viper_vblank)
+ MCFG_CPU_ADD("maincpu", MPC8240, 200000000)
+ MCFG_CPU_CONFIG(viper_ppc_cfg)
+ MCFG_CPU_PROGRAM_MAP(viper_map)
+ MCFG_CPU_VBLANK_INT("screen", viper_vblank)
- MDRV_MACHINE_RESET(viper)
+ MCFG_MACHINE_RESET(viper)
- MDRV_PCI_BUS_ADD("pcibus", 0)
- MDRV_PCI_BUS_DEVICE(0, NULL, mpc8240_pci_r, mpc8240_pci_w)
- MDRV_PCI_BUS_DEVICE(12, "voodoo", voodoo3_pci_r, voodoo3_pci_w)
+ MCFG_PCI_BUS_ADD("pcibus", 0)
+ MCFG_PCI_BUS_DEVICE(0, NULL, mpc8240_pci_r, mpc8240_pci_w)
+ MCFG_PCI_BUS_DEVICE(12, "voodoo", voodoo3_pci_r, voodoo3_pci_w)
- MDRV_IDE_CONTROLLER_ADD("ide", ide_interrupt)
- MDRV_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, 16, "screen")
- MDRV_3DFX_VOODOO_CPU("maincpu")
+ MCFG_IDE_CONTROLLER_ADD("ide", ide_interrupt)
+ MCFG_3DFX_VOODOO_3_ADD("voodoo", STD_VOODOO_3_CLOCK, 16, "screen")
+ MCFG_3DFX_VOODOO_CPU("maincpu")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(800, 600)
- MDRV_SCREEN_VISIBLE_AREA(0, 799, 0, 599)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(800, 600)
+ MCFG_SCREEN_VISIBLE_AREA(0, 799, 0, 599)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_VIDEO_UPDATE(viper)
+ MCFG_VIDEO_UPDATE(viper)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_M48T58_ADD( "m48t58" )
+ MCFG_M48T58_ADD( "m48t58" )
MACHINE_CONFIG_END
/*****************************************************************************/
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 11315929245..37609282e92 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -424,34 +424,34 @@ static VIDEO_UPDATE(varia)
static MACHINE_CONFIG_START( varia, metro_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(varia_program_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) // also level 3
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(varia_program_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold) // also level 3
/* 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(2048, 2048)
- MDRV_SCREEN_VISIBLE_AREA(0+64, 319+64, 0+64, 223+64)
+ 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(2048, 2048)
+ MCFG_SCREEN_VISIBLE_AREA(0+64, 319+64, 0+64, 223+64)
- MDRV_GFXDECODE(vmetal)
- MDRV_PALETTE_LENGTH(0x4000)
+ MCFG_GFXDECODE(vmetal)
+ MCFG_PALETTE_LENGTH(0x4000)
- MDRV_VIDEO_START(varia)
- MDRV_VIDEO_UPDATE(varia)
+ MCFG_VIDEO_START(varia)
+ MCFG_VIDEO_UPDATE(varia)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MDRV_SOUND_ADD("essnd", ES8712, 12000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("essnd", ES8712, 12000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index edfa2b83693..f0b76d36eea 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -260,45 +260,45 @@ static const tc0140syt_interface volfied_tc0140syt_intf =
static MACHINE_CONFIG_START( volfied, volfied_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 8MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 4MHz sound CPU, required to run the game */
- MDRV_CPU_PROGRAM_MAP(z80_map)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 4MHz sound CPU, required to run the game */
+ MCFG_CPU_PROGRAM_MAP(z80_map)
- MDRV_QUANTUM_TIME(HZ(1200))
+ MCFG_QUANTUM_TIME(HZ(1200))
- MDRV_MACHINE_START(volfied)
- MDRV_MACHINE_RESET(volfied)
+ MCFG_MACHINE_START(volfied)
+ MCFG_MACHINE_RESET(volfied)
/* 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(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 8, 247)
+ 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(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 8, 247)
- MDRV_GFXDECODE(volfied)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(volfied)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(volfied)
- MDRV_VIDEO_UPDATE(volfied)
+ MCFG_VIDEO_START(volfied)
+ MCFG_VIDEO_UPDATE(volfied)
- MDRV_PC090OJ_ADD("pc090oj", volfied_pc090oj_intf)
+ MCFG_PC090OJ_ADD("pc090oj", volfied_pc090oj_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- 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.60)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MDRV_TC0140SYT_ADD("tc0140syt", volfied_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", volfied_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vp101.c b/src/mame/drivers/vp101.c
index 3d4e41b7a0d..8e11e7d9dbd 100644
--- a/src/mame/drivers/vp101.c
+++ b/src/mame/drivers/vp101.c
@@ -56,20 +56,20 @@ static const mips3_config r5000_config =
};
static MACHINE_CONFIG_START( vp101, driver_device )
- MDRV_CPU_ADD("maincpu", R5000LE, 300000000) /* actually VR5500 with added NEC VR-series custom instructions */
- MDRV_CPU_CONFIG(r5000_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
-
- 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(320, 240)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
- MDRV_PALETTE_LENGTH(32768)
-
- MDRV_VIDEO_START(vp101)
- MDRV_VIDEO_UPDATE(vp101)
+ MCFG_CPU_ADD("maincpu", R5000LE, 300000000) /* actually VR5500 with added NEC VR-series custom instructions */
+ MCFG_CPU_CONFIG(r5000_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+
+ 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(320, 240)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
+ MCFG_PALETTE_LENGTH(32768)
+
+ MCFG_VIDEO_START(vp101)
+ MCFG_VIDEO_UPDATE(vp101)
MACHINE_CONFIG_END
ROM_START(jnero)
diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c
index 975dc79e48e..0b97aab00ea 100644
--- a/src/mame/drivers/vpoker.c
+++ b/src/mame/drivers/vpoker.c
@@ -651,32 +651,32 @@ static const ptm6840_interface ptm_intf =
static MACHINE_CONFIG_START( vpoker, vpoker_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M6809,XTAL_4MHz)
- MDRV_CPU_PROGRAM_MAP(main_map)
-// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold) //irq0 valid too
+ MCFG_CPU_ADD("maincpu",M6809,XTAL_4MHz)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+// MCFG_CPU_VBLANK_INT("screen",irq0_line_hold) //irq0 valid too
/* 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*8, 480-1, 0*8, 240-1)
-// MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 256-1)
- MDRV_GFXDECODE(vpoker)
- MDRV_PALETTE_LENGTH(8)
- MDRV_PALETTE_INIT(vpoker)
-
- MDRV_VIDEO_START(vpoker)
- MDRV_VIDEO_UPDATE(vpoker)
+ 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*8, 480-1, 0*8, 240-1)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 256-1)
+ MCFG_GFXDECODE(vpoker)
+ MCFG_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(vpoker)
+
+ MCFG_VIDEO_START(vpoker)
+ MCFG_VIDEO_UPDATE(vpoker)
/* 6840 PTM */
- MDRV_PTM6840_ADD("6840ptm", ptm_intf)
+ MCFG_PTM6840_ADD("6840ptm", ptm_intf)
/* 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/vroulet.c b/src/mame/drivers/vroulet.c
index 7a1df32273f..7c5e850932f 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -262,37 +262,37 @@ static const ppi8255_interface ppi8255_intf[2] =
static MACHINE_CONFIG_START( vroulet, driver_device )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", Z80, 4000000) //???
- MDRV_CPU_PROGRAM_MAP(vroulet_map)
- MDRV_CPU_IO_MAP(vroulet_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) //???
+ MCFG_CPU_PROGRAM_MAP(vroulet_map)
+ MCFG_CPU_IO_MAP(vroulet_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[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)
+ 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)
- MDRV_GFXDECODE(vroulet)
- MDRV_PALETTE_LENGTH(128*4)
+ MCFG_GFXDECODE(vroulet)
+ MCFG_PALETTE_LENGTH(128*4)
- MDRV_VIDEO_START(vroulet)
- MDRV_VIDEO_UPDATE(vroulet)
+ MCFG_VIDEO_START(vroulet)
+ MCFG_VIDEO_UPDATE(vroulet)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 87fd1d9d5b5..6188b37154f 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -1644,113 +1644,113 @@ static const nes_interface nes_interface_2 =
static MACHINE_CONFIG_START( vsnes, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map)
+ MCFG_CPU_ADD("maincpu", N2A03,N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(vsnes_cpu1_map)
/* some carts also trigger IRQs */
- MDRV_MACHINE_RESET(vsnes)
- MDRV_MACHINE_START(vsnes)
+ MCFG_MACHINE_RESET(vsnes)
+ MCFG_MACHINE_START(vsnes)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(8*4*16)
+ MCFG_PALETTE_LENGTH(8*4*16)
- MDRV_PALETTE_INIT(vsnes)
- MDRV_VIDEO_START(vsnes)
- MDRV_VIDEO_UPDATE(vsnes)
+ MCFG_PALETTE_INIT(vsnes)
+ MCFG_VIDEO_START(vsnes)
+ MCFG_VIDEO_UPDATE(vsnes)
- MDRV_PPU2C04_ADD("ppu1", vsnes_ppu_interface_1)
+ MCFG_PPU2C04_ADD("ppu1", vsnes_ppu_interface_1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_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)
+ MCFG_SOUND_ADD("nes1", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jajamaru, vsnes )
- MDRV_DEVICE_REMOVE( "ppu1" )
- MDRV_PPU2C05_01_ADD("ppu1", vsnes_ppu_interface_1)
+ MCFG_DEVICE_REMOVE( "ppu1" )
+ MCFG_PPU2C05_01_ADD("ppu1", vsnes_ppu_interface_1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mightybj, vsnes )
- MDRV_DEVICE_REMOVE( "ppu1" )
- MDRV_PPU2C05_02_ADD("ppu1", vsnes_ppu_interface_1)
+ MCFG_DEVICE_REMOVE( "ppu1" )
+ MCFG_PPU2C05_02_ADD("ppu1", vsnes_ppu_interface_1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vsgshoe, vsnes )
- MDRV_DEVICE_REMOVE( "ppu1" )
- MDRV_PPU2C05_03_ADD("ppu1", vsnes_ppu_interface_1)
+ MCFG_DEVICE_REMOVE( "ppu1" )
+ MCFG_PPU2C05_03_ADD("ppu1", vsnes_ppu_interface_1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( topgun, vsnes )
- MDRV_DEVICE_REMOVE( "ppu1" )
- MDRV_PPU2C05_04_ADD("ppu1", vsnes_ppu_interface_1)
+ MCFG_DEVICE_REMOVE( "ppu1" )
+ MCFG_PPU2C05_04_ADD("ppu1", vsnes_ppu_interface_1)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( vsdual, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map)
+ MCFG_CPU_ADD("maincpu", N2A03,N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(vsnes_cpu1_map)
/* some carts also trigger IRQs */
- MDRV_CPU_ADD("sub", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(vsnes_cpu2_map)
+ MCFG_CPU_ADD("sub", N2A03,N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(vsnes_cpu2_map)
/* some carts also trigger IRQs */
- MDRV_MACHINE_RESET(vsdual)
- MDRV_MACHINE_START(vsdual)
+ MCFG_MACHINE_RESET(vsdual)
+ MCFG_MACHINE_START(vsdual)
/* video hardware */
- MDRV_PALETTE_LENGTH(2*8*4*16)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
+ MCFG_PALETTE_LENGTH(2*8*4*16)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
- MDRV_SCREEN_ADD("top", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(32*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("top", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(32*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_SCREEN_ADD("bottom", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(32*8, 262)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("bottom", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(32*8, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_INIT(vsdual)
- MDRV_VIDEO_START(vsdual)
- MDRV_VIDEO_UPDATE(vsdual)
+ MCFG_PALETTE_INIT(vsdual)
+ MCFG_VIDEO_START(vsdual)
+ MCFG_VIDEO_UPDATE(vsdual)
- MDRV_PPU2C04_ADD("ppu1", vsnes_ppu_interface_1)
- MDRV_PPU2C04_ADD("ppu2", vsnes_ppu_interface_2)
+ MCFG_PPU2C04_ADD("ppu1", vsnes_ppu_interface_1)
+ MCFG_PPU2C04_ADD("ppu2", vsnes_ppu_interface_2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_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)
+ MCFG_SOUND_ADD("nes1", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_interface_1)
+ MCFG_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_SOUND_ADD("nes2", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index d60cf472ee6..ef1c3e43bae 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -220,37 +220,37 @@ GFXDECODE_END
static MACHINE_CONFIG_START( vulgus, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(vulgus_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(vulgus_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8)
/* 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)
+ 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)
- MDRV_GFXDECODE(vulgus)
- MDRV_PALETTE_LENGTH(64*4+16*16+4*32*8)
+ MCFG_GFXDECODE(vulgus)
+ MCFG_PALETTE_LENGTH(64*4+16*16+4*32*8)
- MDRV_PALETTE_INIT(vulgus)
- MDRV_VIDEO_START(vulgus)
- MDRV_VIDEO_UPDATE(vulgus)
+ MCFG_PALETTE_INIT(vulgus)
+ MCFG_VIDEO_START(vulgus)
+ MCFG_VIDEO_UPDATE(vulgus)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 593ccc0d550..cb31080f171 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -292,29 +292,29 @@ static DRIVER_INIT( wallca )
static MACHINE_CONFIG_START( wallc, wallc_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 12288000 / 4) /* 3.072 MHz ? */
- MDRV_CPU_PROGRAM_MAP(wallc_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 12288000 / 4) /* 3.072 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(wallc_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(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*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(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(wallc)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(wallc)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(wallc)
- MDRV_VIDEO_START(wallc)
- MDRV_VIDEO_UPDATE(wallc)
+ MCFG_PALETTE_INIT(wallc)
+ MCFG_VIDEO_START(wallc)
+ MCFG_VIDEO_UPDATE(wallc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 12288000 / 8)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 12288000 / 8)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 4028f6da910..55d14f55e89 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -395,49 +395,49 @@ GFXDECODE_END
static MACHINE_CONFIG_START( wardner, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* 6MHz */
- MDRV_CPU_PROGRAM_MAP(main_program_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", wardner_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_PROGRAM_MAP(main_program_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", wardner_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_14MHz/4) /* 3.5MHz */
- MDRV_CPU_PROGRAM_MAP(sound_program_map)
- MDRV_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_14MHz/4) /* 3.5MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_program_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_ADD("dsp", TMS32010, XTAL_14MHz) /* 14MHz Crystal CLKin */
- MDRV_CPU_PROGRAM_MAP(DSP_program_map)
+ MCFG_CPU_ADD("dsp", TMS32010, XTAL_14MHz) /* 14MHz Crystal CLKin */
+ MCFG_CPU_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
- MDRV_CPU_IO_MAP(DSP_io_map)
+ MCFG_CPU_IO_MAP(DSP_io_map)
- MDRV_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
+ MCFG_QUANTUM_TIME(HZ(6000)) /* 100 CPU slices per frame */
- MDRV_MACHINE_RESET(wardner)
+ MCFG_MACHINE_RESET(wardner)
/* video hardware */
- MDRV_MC6845_ADD("crtc", HD6845, XTAL_14MHz/4, twincobr_mc6845_intf) /* 3.5MHz measured on CLKin */
+ MCFG_MC6845_ADD("crtc", HD6845, XTAL_14MHz/4, twincobr_mc6845_intf) /* 3.5MHz measured on CLKin */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK | VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE( (XTAL_14MHz / 2) / (446 * 286) )
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE( (XTAL_14MHz / 2) / (446 * 286) )
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(wardner)
- MDRV_PALETTE_LENGTH(1792)
+ MCFG_GFXDECODE(wardner)
+ MCFG_PALETTE_LENGTH(1792)
- MDRV_VIDEO_START(toaplan0)
- MDRV_VIDEO_EOF(toaplan0)
- MDRV_VIDEO_UPDATE(toaplan0)
+ MCFG_VIDEO_START(toaplan0)
+ MCFG_VIDEO_EOF(toaplan0)
+ MCFG_VIDEO_UPDATE(toaplan0)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, XTAL_14MHz/4)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14MHz/4)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index ebe52059452..1bea6131a68 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -725,73 +725,73 @@ GFXDECODE_END
static MACHINE_CONFIG_START( geebee, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(geebee_map)
- MDRV_CPU_IO_MAP(geebee_port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(geebee_map)
+ MCFG_CPU_IO_MAP(geebee_port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224)
- MDRV_GFXDECODE(1k)
- MDRV_PALETTE_LENGTH(4*2)
+ MCFG_GFXDECODE(1k)
+ MCFG_PALETTE_LENGTH(4*2)
- MDRV_PALETTE_INIT(geebee)
- MDRV_VIDEO_START(geebee)
- MDRV_VIDEO_UPDATE(geebee)
+ MCFG_PALETTE_INIT(geebee)
+ MCFG_VIDEO_START(geebee)
+ MCFG_VIDEO_UPDATE(geebee)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("geebee", GEEBEE, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("geebee", GEEBEE, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( navarone, geebee )
/* basic machine hardware */
- MDRV_GFXDECODE(2k)
- MDRV_PALETTE_LENGTH(2*2+1)
+ MCFG_GFXDECODE(2k)
+ MCFG_PALETTE_LENGTH(2*2+1)
- MDRV_PALETTE_INIT(navarone)
- MDRV_VIDEO_START(navarone)
- MDRV_VIDEO_UPDATE(navarone)
+ MCFG_PALETTE_INIT(navarone)
+ MCFG_VIDEO_START(navarone)
+ MCFG_VIDEO_UPDATE(navarone)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( bombbee, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 18.432 MHz / 9 */
- MDRV_CPU_PROGRAM_MAP(bombbee_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 18.432 MHz / 9 */
+ MCFG_CPU_PROGRAM_MAP(bombbee_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224)
- MDRV_GFXDECODE(color)
- MDRV_PALETTE_LENGTH(2*256+1)
+ MCFG_GFXDECODE(color)
+ MCFG_PALETTE_LENGTH(2*256+1)
- MDRV_PALETTE_INIT(warpwarp)
- MDRV_VIDEO_START(warpwarp)
- MDRV_VIDEO_UPDATE(warpwarp)
+ MCFG_PALETTE_INIT(warpwarp)
+ MCFG_VIDEO_START(warpwarp)
+ MCFG_VIDEO_UPDATE(warpwarp)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("warpwarp", WARPWARP, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("warpwarp", WARPWARP, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( warpwarp, bombbee )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(warpwarp_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(warpwarp_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index c64e94e7aef..97332878607 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -574,134 +574,134 @@ static MACHINE_RESET( taito_dualscreen )
static MACHINE_CONFIG_START( darius2d, warriorb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */
- MDRV_CPU_PROGRAM_MAP(darius2d_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */
+ MCFG_CPU_PROGRAM_MAP(darius2d_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_MACHINE_START( warriorb )
- MDRV_MACHINE_RESET( taito_dualscreen )
+ MCFG_MACHINE_START( warriorb )
+ MCFG_MACHINE_RESET( taito_dualscreen )
- MDRV_TC0220IOC_ADD("tc0220ioc", darius2d_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", darius2d_io_intf)
/* video hardware */
- MDRV_GFXDECODE(warriorb)
- MDRV_PALETTE_LENGTH(4096*2)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 32*8-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 32*8-1)
-
- MDRV_VIDEO_START(warriorb)
- MDRV_VIDEO_UPDATE(warriorb)
-
- MDRV_TC0100SCN_ADD("tc0100scn_1", darius2d_tc0100scn_intf_l)
- MDRV_TC0100SCN_ADD("tc0100scn_2", darius2d_tc0100scn_intf_r)
- MDRV_TC0110PCR_ADD("tc0110pcr_1", darius2d_tc0110pcr_intf_l)
- MDRV_TC0110PCR_ADD("tc0110pcr_2", darius2d_tc0110pcr_intf_r)
+ MCFG_GFXDECODE(warriorb)
+ MCFG_PALETTE_LENGTH(4096*2)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 32*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 32*8-1)
+
+ MCFG_VIDEO_START(warriorb)
+ MCFG_VIDEO_UPDATE(warriorb)
+
+ MCFG_TC0100SCN_ADD("tc0100scn_1", darius2d_tc0100scn_intf_l)
+ MCFG_TC0100SCN_ADD("tc0100scn_2", darius2d_tc0100scn_intf_r)
+ MCFG_TC0110PCR_ADD("tc0110pcr_1", darius2d_tc0110pcr_intf_l)
+ MCFG_TC0110PCR_ADD("tc0110pcr_2", darius2d_tc0110pcr_intf_r)
/* sound hardware */
- 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, "2610.1.l", 1.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
-
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", warriorb_tc0140syt_intf)
+ 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, "2610.1.l", 1.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 1.0)
+
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", warriorb_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( warriorb, warriorb_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ? */
- MDRV_CPU_PROGRAM_MAP(warriorb_map)
- MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(warriorb_map)
+ MCFG_CPU_VBLANK_INT("lscreen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_MACHINE_START( warriorb )
- MDRV_MACHINE_RESET( taito_dualscreen )
+ MCFG_MACHINE_START( warriorb )
+ MCFG_MACHINE_RESET( taito_dualscreen )
- MDRV_TC0510NIO_ADD("tc0510nio", warriorb_io_intf)
+ MCFG_TC0510NIO_ADD("tc0510nio", warriorb_io_intf)
/* video hardware */
- MDRV_GFXDECODE(warriorb)
- MDRV_PALETTE_LENGTH(4096*2)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
-
- MDRV_VIDEO_START(warriorb)
- MDRV_VIDEO_UPDATE(warriorb)
-
- MDRV_TC0100SCN_ADD("tc0100scn_1", warriorb_tc0100scn_intf_l)
- MDRV_TC0100SCN_ADD("tc0100scn_2", warriorb_tc0100scn_intf_r)
- MDRV_TC0110PCR_ADD("tc0110pcr_1", darius2d_tc0110pcr_intf_l)
- MDRV_TC0110PCR_ADD("tc0110pcr_2", darius2d_tc0110pcr_intf_r)
+ MCFG_GFXDECODE(warriorb)
+ MCFG_PALETTE_LENGTH(4096*2)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
+
+ MCFG_VIDEO_START(warriorb)
+ MCFG_VIDEO_UPDATE(warriorb)
+
+ MCFG_TC0100SCN_ADD("tc0100scn_1", warriorb_tc0100scn_intf_l)
+ MCFG_TC0100SCN_ADD("tc0100scn_2", warriorb_tc0100scn_intf_r)
+ MCFG_TC0110PCR_ADD("tc0110pcr_1", darius2d_tc0110pcr_intf_l)
+ MCFG_TC0110PCR_ADD("tc0110pcr_2", darius2d_tc0110pcr_intf_r)
/* sound hardware */
- 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, "2610.1.l", 1.0)
- MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0)
- MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0)
-
- MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MDRV_TC0140SYT_ADD("tc0140syt", warriorb_tc0140syt_intf)
+ 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, "2610.1.l", 1.0)
+ MCFG_SOUND_ROUTE(1, "2610.1.r", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.l", 1.0)
+ MCFG_SOUND_ROUTE(2, "2610.2.r", 1.0)
+
+ MCFG_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+
+ MCFG_TC0140SYT_ADD("tc0140syt", warriorb_tc0140syt_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index bcb9b61df38..039133fe83a 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -309,44 +309,44 @@ static const ym2608_interface ym2608_config =
static MACHINE_CONFIG_START( wc90, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_8MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(wc90_map_1)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(wc90_map_1)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, XTAL_8MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(wc90_map_2)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, XTAL_8MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(wc90_map_2)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main CPU */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.17) /* verified on pcb */
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.17) /* verified on pcb */
+ 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)
- MDRV_GFXDECODE(wc90)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(wc90)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(wc90)
- MDRV_VIDEO_UPDATE(wc90)
+ MCFG_VIDEO_START(wc90)
+ MCFG_VIDEO_UPDATE(wc90)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2608, XTAL_8MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2608_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 1.0)
- MDRV_SOUND_ROUTE(2, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2608, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2608_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 1.0)
+ MCFG_SOUND_ROUTE(2, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wc90t, wc90 )
- MDRV_VIDEO_START( wc90t )
+ MCFG_VIDEO_START( wc90t )
MACHINE_CONFIG_END
ROM_START( wc90 )
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index 4dd549bd8ec..ddbb839107e 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -363,42 +363,42 @@ static const msm5205_interface msm5205_config =
static MACHINE_CONFIG_START( wc90b, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(wc90b_map1)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(wc90b_map1)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(wc90b_map2)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(wc90b_map2)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_cpu)
/* IRQs are triggered by the main CPU */
/* 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)
+ 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)
- MDRV_GFXDECODE(wc90b)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(wc90b)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(wc90b)
- MDRV_VIDEO_UPDATE(wc90b)
+ MCFG_VIDEO_START(wc90b)
+ MCFG_VIDEO_UPDATE(wc90b)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, YM2203_CLOCK)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("ymsnd", YM2203, YM2203_CLOCK)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("msm", MSM5205, MSM5205_CLOCK)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("msm", MSM5205, MSM5205_CLOCK)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
ROM_START( wc90b1 )
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index ccdbb5f4821..10b14385115 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -1036,46 +1036,46 @@ static MACHINE_RESET( wecleman )
static MACHINE_CONFIG_START( wecleman, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* Schems show 10MHz */
- MDRV_CPU_PROGRAM_MAP(wecleman_map)
- MDRV_CPU_VBLANK_INT_HACK(wecleman_interrupt,5 + 1) /* in order to read the inputs once per frame */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* Schems show 10MHz */
+ MCFG_CPU_PROGRAM_MAP(wecleman_map)
+ MCFG_CPU_VBLANK_INT_HACK(wecleman_interrupt,5 + 1) /* in order to read the inputs once per frame */
- MDRV_CPU_ADD("sub", M68000, 10000000) /* Schems show 10MHz */
- MDRV_CPU_PROGRAM_MAP(wecleman_sub_map)
+ MCFG_CPU_ADD("sub", M68000, 10000000) /* Schems show 10MHz */
+ MCFG_CPU_PROGRAM_MAP(wecleman_sub_map)
/* Schems: can be reset, no nmi, soundlatch, 3.58MHz */
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(wecleman_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(wecleman_sound_map)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_RESET(wecleman)
+ MCFG_MACHINE_RESET(wecleman)
/* 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_RGB32)
- MDRV_SCREEN_SIZE(320 +16, 224 +16)
- MDRV_SCREEN_VISIBLE_AREA(0 +8, 320-1 +8, 0 +8, 224-1 +8)
+ 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(320 +16, 224 +16)
+ MCFG_SCREEN_VISIBLE_AREA(0 +8, 320-1 +8, 0 +8, 224-1 +8)
- MDRV_GFXDECODE(wecleman)
+ MCFG_GFXDECODE(wecleman)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(wecleman)
- MDRV_VIDEO_UPDATE(wecleman)
+ MCFG_VIDEO_START(wecleman)
+ MCFG_VIDEO_UPDATE(wecleman)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.85)
- MDRV_SOUND_ROUTE(1, "mono", 0.85)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.85)
+ MCFG_SOUND_ROUTE(1, "mono", 0.85)
- MDRV_SOUND_ADD("konami", K007232, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("konami", K007232, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
@@ -1107,52 +1107,52 @@ static const k051316_interface hotchase_k051316_intf_1 =
static MACHINE_CONFIG_START( hotchase, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
- MDRV_CPU_PROGRAM_MAP(hotchase_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
+ MCFG_CPU_PROGRAM_MAP(hotchase_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("sub", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
- MDRV_CPU_PROGRAM_MAP(hotchase_sub_map)
+ MCFG_CPU_ADD("sub", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
+ MCFG_CPU_PROGRAM_MAP(hotchase_sub_map)
- MDRV_CPU_ADD("audiocpu", M6809, 3579545 / 2) /* 3.579/2 MHz - PCB is drawn in one set's readme */
- MDRV_CPU_PROGRAM_MAP(hotchase_sound_map)
- MDRV_CPU_PERIODIC_INT( hotchase_sound_timer, 496 )
+ MCFG_CPU_ADD("audiocpu", M6809, 3579545 / 2) /* 3.579/2 MHz - PCB is drawn in one set's readme */
+ MCFG_CPU_PROGRAM_MAP(hotchase_sound_map)
+ MCFG_CPU_PERIODIC_INT( hotchase_sound_timer, 496 )
/* Amuse: every 2 ms */
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* 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(320, 224)
- MDRV_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-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(320, 224)
+ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
- MDRV_GFXDECODE(hotchase)
- MDRV_PALETTE_LENGTH(2048*2)
+ MCFG_GFXDECODE(hotchase)
+ MCFG_PALETTE_LENGTH(2048*2)
- MDRV_VIDEO_START(hotchase)
- MDRV_VIDEO_UPDATE(hotchase)
+ MCFG_VIDEO_START(hotchase)
+ MCFG_VIDEO_UPDATE(hotchase)
- MDRV_K051316_ADD("k051316_1", hotchase_k051316_intf_0)
- MDRV_K051316_ADD("k051316_2", hotchase_k051316_intf_1)
+ MCFG_K051316_ADD("k051316_1", hotchase_k051316_intf_0)
+ MCFG_K051316_ADD("k051316_2", hotchase_k051316_intf_1)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("konami1", K007232, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("konami1", K007232, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD("konami2", K007232, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("konami2", K007232, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
- MDRV_SOUND_ADD("konami3", K007232, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("konami3", K007232, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 4a1e57d4a58..d8f459d1627 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -708,44 +708,44 @@ static DRIVER_INIT( quiz18k )
static MACHINE_CONFIG_START( welltris, welltris_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,20000000/2) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_port_map) /* IRQs are triggered by the YM2610 */
+ MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_port_map) /* IRQs are triggered by the YM2610 */
/* 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(15, 367-1, 8, 248-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(15, 367-1, 8, 248-1)
- MDRV_GFXDECODE(welltris)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(welltris)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(welltris)
- MDRV_VIDEO_UPDATE(welltris)
+ MCFG_VIDEO_START(welltris)
+ MCFG_VIDEO_UPDATE(welltris)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.75)
- MDRV_SOUND_ROUTE(2, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.75)
+ MCFG_SOUND_ROUTE(2, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( quiz18k, welltris )
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(15, 335-1, 0, 224-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(15, 335-1, 0, 224-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index fc23c9cd952..b24c1667aa7 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -1001,62 +1001,62 @@ static const tc0140syt_interface wgp_tc0140syt_intf =
static MACHINE_CONFIG_START( wgp, wgp_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MDRV_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(cpu2_map)
- MDRV_CPU_VBLANK_INT("screen", wgp_cpub_interrupt)
+ MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_CPU_VBLANK_INT("screen", wgp_cpub_interrupt)
- MDRV_MACHINE_START(wgp)
- MDRV_MACHINE_RESET(wgp)
+ MCFG_MACHINE_START(wgp)
+ MCFG_MACHINE_RESET(wgp)
- MDRV_QUANTUM_TIME(HZ(30000))
+ MCFG_QUANTUM_TIME(HZ(30000))
- MDRV_TC0220IOC_ADD("tc0220ioc", wgp_io_intf)
+ MCFG_TC0220IOC_ADD("tc0220ioc", wgp_io_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(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*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(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(wgp)
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_GFXDECODE(wgp)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_VIDEO_START(wgp)
- MDRV_VIDEO_UPDATE(wgp)
+ MCFG_VIDEO_START(wgp)
+ MCFG_VIDEO_UPDATE(wgp)
- MDRV_TC0100SCN_ADD("tc0100scn", wgp_tc0100scn_intf)
+ MCFG_TC0100SCN_ADD("tc0100scn", wgp_tc0100scn_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_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_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)
- MDRV_TC0140SYT_ADD("tc0140syt", wgp_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", wgp_tc0140syt_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wgp2, wgp )
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
/* video hardware */
- MDRV_VIDEO_START(wgp2)
+ MCFG_VIDEO_START(wgp2)
- MDRV_DEVICE_REMOVE("tc0100scn")
- MDRV_TC0100SCN_ADD("tc0100scn", wgp2_tc0100scn_intf)
+ MCFG_DEVICE_REMOVE("tc0100scn")
+ MCFG_TC0100SCN_ADD("tc0100scn", wgp2_tc0100scn_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index 63b55b11891..12d711a3f05 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -806,43 +806,43 @@ static MACHINE_START( wheelfir )
static MACHINE_CONFIG_START( wheelfir, wheelfir_state )
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2)
- MDRV_CPU_PROGRAM_MAP(wheelfir_main)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2)
+ MCFG_CPU_PROGRAM_MAP(wheelfir_main)
- MDRV_CPU_ADD("subcpu", M68000, 32000000/2)
- MDRV_CPU_PROGRAM_MAP(wheelfir_sub)
- //MDRV_CPU_VBLANK_INT_HACK(irq1_line_hold,256)
+ MCFG_CPU_ADD("subcpu", M68000, 32000000/2)
+ MCFG_CPU_PROGRAM_MAP(wheelfir_sub)
+ //MCFG_CPU_VBLANK_INT_HACK(irq1_line_hold,256)
- MDRV_QUANTUM_TIME(HZ(12000))
+ MCFG_QUANTUM_TIME(HZ(12000))
- MDRV_MACHINE_RESET (wheelfir)
+ MCFG_MACHINE_RESET (wheelfir)
- MDRV_TIMER_ADD_SCANLINE("scan_timer", scanline_timer_callback, "screen", 0, 1)
+ MCFG_TIMER_ADD_SCANLINE("scan_timer", scanline_timer_callback, "screen", 0, 1)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(336, NUM_SCANLINES+NUM_VBLANK_LINES)
- MDRV_SCREEN_VISIBLE_AREA(0,335, 0, NUM_SCANLINES-1)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(336, NUM_SCANLINES+NUM_VBLANK_LINES)
+ MCFG_SCREEN_VISIBLE_AREA(0,335, 0, NUM_SCANLINES-1)
- MDRV_PALETTE_LENGTH(NUM_COLORS)
+ MCFG_PALETTE_LENGTH(NUM_COLORS)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_MACHINE_START(wheelfir)
+ MCFG_MACHINE_START(wheelfir)
- MDRV_VIDEO_START(wheelfir)
- MDRV_VIDEO_UPDATE(wheelfir)
- MDRV_VIDEO_EOF(wheelfir)
+ MCFG_VIDEO_START(wheelfir)
+ MCFG_VIDEO_UPDATE(wheelfir)
+ MCFG_VIDEO_EOF(wheelfir)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 1a6f25930b7..dd510309858 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -1430,46 +1430,46 @@ GFXDECODE_END
static MACHINE_CONFIG_START( defender, williams_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
- MDRV_CPU_PROGRAM_MAP(defender_map)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
+ MCFG_CPU_PROGRAM_MAP(defender_map)
- MDRV_CPU_ADD("soundcpu", M6808, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(defender_sound_map)
+ MCFG_CPU_ADD("soundcpu", M6808, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(defender_sound_map)
- MDRV_MACHINE_START(defender)
- MDRV_MACHINE_RESET(defender)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(defender)
+ MCFG_MACHINE_RESET(defender)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_TIMER_ADD("scan_timer", williams_va11_callback)
- MDRV_TIMER_ADD("240_timer", williams_count240_callback)
+ MCFG_TIMER_ADD("scan_timer", williams_va11_callback)
+ MCFG_TIMER_ADD("240_timer", williams_count240_callback)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 10, 304, 260, 7, 245)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 10, 304, 260, 7, 245)
- MDRV_VIDEO_START(williams)
- MDRV_VIDEO_UPDATE(williams)
+ MCFG_VIDEO_START(williams)
+ MCFG_VIDEO_UPDATE(williams)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("wmsdac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("wmsdac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* pia */
- MDRV_PIA6821_ADD("pia_0", williams_pia_0_intf)
- MDRV_PIA6821_ADD("pia_1", williams_pia_1_intf)
- MDRV_PIA6821_ADD("pia_2", williams_snd_pia_intf)
+ MCFG_PIA6821_ADD("pia_0", williams_pia_0_intf)
+ MCFG_PIA6821_ADD("pia_1", williams_pia_1_intf)
+ MCFG_PIA6821_ADD("pia_2", williams_snd_pia_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( jin, defender ) // needs a different screen size or the credit text is clipped
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0, 315, 7, 245)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0, 315, 7, 245)
MACHINE_CONFIG_END
@@ -1477,16 +1477,16 @@ static MACHINE_CONFIG_DERIVED( williams, defender )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(williams_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(williams_map)
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(williams)
- MDRV_MACHINE_RESET(williams)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(6, 298-1, 7, 247-1)
+ MCFG_MACHINE_START(williams)
+ MCFG_MACHINE_RESET(williams)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(6, 298-1, 7, 247-1)
MACHINE_CONFIG_END
@@ -1495,7 +1495,7 @@ static MACHINE_CONFIG_DERIVED( williams_muxed, williams )
/* basic machine hardware */
/* pia */
- MDRV_PIA6821_MODIFY("pia_0", williams_muxed_pia_0_intf)
+ MCFG_PIA6821_MODIFY("pia_0", williams_muxed_pia_0_intf)
MACHINE_CONFIG_END
@@ -1503,8 +1503,8 @@ static MACHINE_CONFIG_DERIVED( williams_extra_ram, williams )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(williams_extra_ram_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(williams_extra_ram_map)
MACHINE_CONFIG_END
@@ -1513,7 +1513,7 @@ static MACHINE_CONFIG_DERIVED( spdball, williams )
/* basic machine hardware */
/* pia */
- MDRV_PIA6821_ADD("pia_3", spdball_pia_3_intf)
+ MCFG_PIA6821_ADD("pia_3", spdball_pia_3_intf)
MACHINE_CONFIG_END
@@ -1522,8 +1522,8 @@ static MACHINE_CONFIG_DERIVED( lottofun, williams )
/* basic machine hardware */
/* pia */
- MDRV_PIA6821_MODIFY("pia_0", lottofun_pia_0_intf)
- MDRV_TICKET_DISPENSER_ADD("ticket", 70, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_PIA6821_MODIFY("pia_0", lottofun_pia_0_intf)
+ MCFG_TICKET_DISPENSER_ADD("ticket", 70, TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
MACHINE_CONFIG_END
@@ -1531,16 +1531,16 @@ static MACHINE_CONFIG_DERIVED( alienar, defender )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(williams_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(williams_map)
- MDRV_MACHINE_START(williams)
- MDRV_MACHINE_RESET(williams)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(6, 298-1, 7, 247-1)
+ MCFG_MACHINE_START(williams)
+ MCFG_MACHINE_RESET(williams)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(6, 298-1, 7, 247-1)
/* pia */
- MDRV_PIA6821_MODIFY("pia_0", williams_muxed_pia_0_intf)
+ MCFG_PIA6821_MODIFY("pia_0", williams_muxed_pia_0_intf)
MACHINE_CONFIG_END
@@ -1549,12 +1549,12 @@ static MACHINE_CONFIG_DERIVED( sinistar, williams_extra_ram )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_ADD("cvsd", HC55516, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* pia */
- MDRV_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf)
- MDRV_PIA6821_MODIFY("pia_2", sinistar_snd_pia_intf)
+ MCFG_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf)
+ MCFG_PIA6821_MODIFY("pia_2", sinistar_snd_pia_intf)
MACHINE_CONFIG_END
@@ -1563,16 +1563,16 @@ static MACHINE_CONFIG_DERIVED( playball, williams )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(6, 298-1, 8, 239-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(6, 298-1, 8, 239-1)
/* sound hardware */
- MDRV_SOUND_ADD("cvsd", HC55516, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* pia */
- MDRV_PIA6821_MODIFY("pia_1", playball_pia_1_intf)
- MDRV_PIA6821_MODIFY("pia_2", sinistar_snd_pia_intf)
+ MCFG_PIA6821_MODIFY("pia_1", playball_pia_1_intf)
+ MCFG_PIA6821_MODIFY("pia_2", sinistar_snd_pia_intf)
MACHINE_CONFIG_END
@@ -1580,18 +1580,18 @@ static MACHINE_CONFIG_DERIVED( blaster, williams )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(blaster_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(blaster_map)
- MDRV_MACHINE_START(blaster)
- MDRV_MACHINE_RESET(blaster)
+ MCFG_MACHINE_START(blaster)
+ MCFG_MACHINE_RESET(blaster)
/* video hardware */
- MDRV_VIDEO_START(blaster)
- MDRV_VIDEO_UPDATE(blaster)
+ MCFG_VIDEO_START(blaster)
+ MCFG_VIDEO_UPDATE(blaster)
/* pia */
- MDRV_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf)
+ MCFG_PIA6821_MODIFY("pia_0", williams_49way_pia_0_intf)
MACHINE_CONFIG_END
@@ -1600,48 +1600,48 @@ static MACHINE_CONFIG_DERIVED( blastkit, blaster )
/* basic machine hardware */
/* pia */
- MDRV_PIA6821_MODIFY("pia_0", williams_49way_muxed_pia_0_intf)
+ MCFG_PIA6821_MODIFY("pia_0", williams_49way_muxed_pia_0_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( williams2, williams_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
- MDRV_CPU_PROGRAM_MAP(williams2_map)
+ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
+ MCFG_CPU_PROGRAM_MAP(williams2_map)
- MDRV_CPU_ADD("soundcpu", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */
- MDRV_CPU_PROGRAM_MAP(williams2_sound_map)
+ MCFG_CPU_ADD("soundcpu", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */
+ MCFG_CPU_PROGRAM_MAP(williams2_sound_map)
- MDRV_MACHINE_START(williams2)
- MDRV_MACHINE_RESET(williams2)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(williams2)
+ MCFG_MACHINE_RESET(williams2)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_TIMER_ADD("scan_timer", williams2_va11_callback)
- MDRV_TIMER_ADD("254_timer", williams2_endscreen_callback)
+ MCFG_TIMER_ADD("scan_timer", williams2_va11_callback)
+ MCFG_TIMER_ADD("254_timer", williams2_endscreen_callback)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
- MDRV_PALETTE_LENGTH(1024)
- MDRV_GFXDECODE(williams2)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_GFXDECODE(williams2)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 8, 284, 260, 8, 248)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK*2/3, 512, 8, 284, 260, 8, 248)
- MDRV_VIDEO_START(williams2)
- MDRV_VIDEO_UPDATE(williams2)
+ MCFG_VIDEO_START(williams2)
+ MCFG_VIDEO_UPDATE(williams2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("wmsdac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("wmsdac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* pia */
- MDRV_PIA6821_ADD("pia_0", williams2_muxed_pia_0_intf)
- MDRV_PIA6821_ADD("pia_1", williams2_pia_1_intf)
- MDRV_PIA6821_ADD("pia_2", williams2_snd_pia_intf)
+ MCFG_PIA6821_ADD("pia_0", williams2_muxed_pia_0_intf)
+ MCFG_PIA6821_ADD("pia_1", williams2_pia_1_intf)
+ MCFG_PIA6821_ADD("pia_2", williams2_snd_pia_intf)
MACHINE_CONFIG_END
@@ -1649,8 +1649,8 @@ static MACHINE_CONFIG_DERIVED( williams2_extra_ram, williams2 )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(williams2_extra_ram_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(williams2_extra_ram_map)
MACHINE_CONFIG_END
@@ -1659,8 +1659,8 @@ static MACHINE_CONFIG_DERIVED( mysticm, williams2_extra_ram )
/* basic machine hardware */
/* pia */
- MDRV_PIA6821_MODIFY("pia_0", mysticm_pia_0_intf)
- MDRV_PIA6821_MODIFY("pia_1", mysticm_pia_1_intf)
+ MCFG_PIA6821_MODIFY("pia_0", mysticm_pia_0_intf)
+ MCFG_PIA6821_MODIFY("pia_1", mysticm_pia_1_intf)
MACHINE_CONFIG_END
@@ -1669,23 +1669,23 @@ static MACHINE_CONFIG_DERIVED( tshoot, williams2 )
/* basic machine hardware */
/* pia */
- MDRV_PIA6821_MODIFY("pia_0", tshoot_pia_0_intf)
- MDRV_PIA6821_MODIFY("pia_1", tshoot_pia_1_intf)
- MDRV_PIA6821_MODIFY("pia_2", tshoot_snd_pia_intf)
+ MCFG_PIA6821_MODIFY("pia_0", tshoot_pia_0_intf)
+ MCFG_PIA6821_MODIFY("pia_1", tshoot_pia_1_intf)
+ MCFG_PIA6821_MODIFY("pia_2", tshoot_snd_pia_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( joust2, williams2 )
/* basic machine hardware */
- MDRV_DEVICE_REMOVE("mono")
- MDRV_FRAGMENT_ADD(williams_cvsd_sound)
+ MCFG_DEVICE_REMOVE("mono")
+ MCFG_FRAGMENT_ADD(williams_cvsd_sound)
- MDRV_MACHINE_START(joust2)
- MDRV_MACHINE_RESET(joust2)
+ MCFG_MACHINE_START(joust2)
+ MCFG_MACHINE_RESET(joust2)
/* pia */
- MDRV_PIA6821_MODIFY("pia_1", joust2_pia_1_intf)
+ MCFG_PIA6821_MODIFY("pia_1", joust2_pia_1_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 85ecdfb8e5a..cc54fc50e8f 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -329,38 +329,38 @@ static MACHINE_RESET( wink )
static MACHINE_CONFIG_START( wink, wink_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 12000000 / 4)
- MDRV_CPU_PROGRAM_MAP(wink_map)
- MDRV_CPU_IO_MAP(wink_io)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 12000000 / 4)
+ MCFG_CPU_PROGRAM_MAP(wink_map)
+ MCFG_CPU_IO_MAP(wink_io)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80, 12000000 / 8)
- MDRV_CPU_PROGRAM_MAP(wink_sound_map)
- MDRV_CPU_IO_MAP(wink_sound_io)
- MDRV_CPU_PERIODIC_INT(wink_sound, 15625)
+ MCFG_CPU_ADD("audiocpu", Z80, 12000000 / 8)
+ MCFG_CPU_PROGRAM_MAP(wink_sound_map)
+ MCFG_CPU_IO_MAP(wink_sound_io)
+ MCFG_CPU_PERIODIC_INT(wink_sound, 15625)
- MDRV_NVRAM_ADD_1FILL("nvram")
- MDRV_MACHINE_RESET(wink)
+ MCFG_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_RESET(wink)
/* 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, 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(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(wink)
- MDRV_PALETTE_LENGTH(16)
+ MCFG_GFXDECODE(wink)
+ MCFG_PALETTE_LENGTH(16)
- MDRV_VIDEO_START(wink)
- MDRV_VIDEO_UPDATE(wink)
+ MCFG_VIDEO_START(wink)
+ MCFG_VIDEO_UPDATE(wink)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8912, 12000000 / 8)
- MDRV_SOUND_CONFIG(ay8912_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8912, 12000000 / 8)
+ MCFG_SOUND_CONFIG(ay8912_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index b8c26d59b75..86f15767555 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -281,33 +281,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( wiping, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,120) /* periodic interrupt, don't know about the frequency */
+ MCFG_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,120) /* periodic interrupt, don't know about the frequency */
/* 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(36*8, 28*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*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(36*8, 28*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(wiping)
- MDRV_PALETTE_LENGTH(64*4+64*4)
+ MCFG_GFXDECODE(wiping)
+ MCFG_PALETTE_LENGTH(64*4+64*4)
- MDRV_PALETTE_INIT(wiping)
- MDRV_VIDEO_UPDATE(wiping)
+ MCFG_PALETTE_INIT(wiping)
+ MCFG_VIDEO_UPDATE(wiping)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("wiping", WIPING, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("wiping", WIPING, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index f0e05e781a0..731fd3f47c4 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -759,44 +759,44 @@ static INTERRUPT_GEN( witch_sub_interrupt )
static MACHINE_CONFIG_START( witch, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(map_main)
- MDRV_CPU_VBLANK_INT("screen", witch_main_interrupt)
+ MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(map_main)
+ MCFG_CPU_VBLANK_INT("screen", witch_main_interrupt)
/* 2nd z80 */
- MDRV_CPU_ADD("sub", Z80,8000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(map_sub)
- MDRV_CPU_VBLANK_INT("screen", witch_sub_interrupt)
+ MCFG_CPU_ADD("sub", Z80,8000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(map_sub)
+ MCFG_CPU_VBLANK_INT("screen", witch_sub_interrupt)
- 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(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(8, 256-1-8, 8*4, 256-8*4-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(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(8, 256-1-8, 8*4, 256-8*4-1)
- MDRV_GFXDECODE(witch)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_GFXDECODE(witch)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(witch)
- MDRV_VIDEO_UPDATE(witch)
+ MCFG_VIDEO_START(witch)
+ MCFG_VIDEO_UPDATE(witch)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("essnd", ES8712, 8000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("essnd", ES8712, 8000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_interface_0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_interface_0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD("ym2", YM2203, 1500000)
- MDRV_SOUND_CONFIG(ym2203_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("ym2", YM2203, 1500000)
+ MCFG_SOUND_CONFIG(ym2203_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index c072b231bfa..7b7299727d3 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -682,42 +682,42 @@ static MACHINE_RESET( wiz )
static MACHINE_CONFIG_START( wiz, wiz_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? */
+ MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? */
- MDRV_MACHINE_RESET( wiz )
+ MCFG_MACHINE_RESET( wiz )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* frames per second, vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* frames per second, vblank duration */)
+ 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)
- MDRV_GFXDECODE(wiz)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(wiz)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(wiz)
- MDRV_VIDEO_START(wiz)
- MDRV_VIDEO_UPDATE(wiz)
+ MCFG_PALETTE_INIT(wiz)
+ MCFG_VIDEO_START(wiz)
+ MCFG_VIDEO_UPDATE(wiz)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("8910.1", AY8910, 18432000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("8910.1", AY8910, 18432000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("8910.2", AY8910, 18432000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("8910.2", AY8910, 18432000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("8910.3", AY8910, 18432000/12)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("8910.3", AY8910, 18432000/12)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -725,25 +725,25 @@ static MACHINE_CONFIG_DERIVED( stinger, wiz )
/* basic machine hardware */
- MDRV_CPU_MODIFY("audiocpu")
- MDRV_CPU_PROGRAM_MAP(stinger_sound_map)
+ MCFG_CPU_MODIFY("audiocpu")
+ MCFG_CPU_PROGRAM_MAP(stinger_sound_map)
/* video hardware */
- MDRV_GFXDECODE(stinger)
- MDRV_VIDEO_UPDATE(stinger)
+ MCFG_GFXDECODE(stinger)
+ MCFG_VIDEO_UPDATE(stinger)
/* sound hardware */
- MDRV_SOUND_MODIFY("8910.1")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_MODIFY("8910.1")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_SOUND_MODIFY("8910.2")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
+ MCFG_SOUND_MODIFY("8910.2")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MDRV_DEVICE_REMOVE("8910.3")
+ MCFG_DEVICE_REMOVE("8910.3")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(stinger)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(stinger)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -752,8 +752,8 @@ static MACHINE_CONFIG_DERIVED( scion, stinger )
/* basic machine hardware */
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(2*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 32*8-1, 2*8, 30*8-1)
MACHINE_CONFIG_END
@@ -763,8 +763,8 @@ static MACHINE_CONFIG_DERIVED( kungfut, wiz )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(stinger)
- MDRV_VIDEO_UPDATE(kungfut)
+ MCFG_GFXDECODE(stinger)
+ MCFG_VIDEO_UPDATE(kungfut)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index d4c2e28a4d0..81475fa7c14 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -348,25 +348,25 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( wldarrow, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, 2000000)
- MDRV_CPU_PROGRAM_MAP(wldarrow_map)
+ MCFG_CPU_ADD("maincpu", I8080, 2000000)
+ MCFG_CPU_PROGRAM_MAP(wldarrow_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_UPDATE(wldarrow)
+ MCFG_VIDEO_UPDATE(wldarrow)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 32*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index 6473b5a6197..9f6e1840d40 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -285,32 +285,32 @@ GFXDECODE_END
static MACHINE_CONFIG_START( wolfpack, driver_device )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16)
+ MCFG_CPU_PROGRAM_MAP(main_map)
/* video hardware */
- MDRV_MACHINE_RESET(wolfpack)
+ MCFG_MACHINE_RESET(wolfpack)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 262)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 16, 239)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 262)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 16, 239)
- MDRV_GFXDECODE(wolfpack)
- MDRV_PALETTE_LENGTH(12)
- MDRV_PALETTE_INIT(wolfpack)
- MDRV_VIDEO_START(wolfpack)
- MDRV_VIDEO_UPDATE(wolfpack)
- MDRV_VIDEO_EOF(wolfpack)
+ MCFG_GFXDECODE(wolfpack)
+ MCFG_PALETTE_LENGTH(12)
+ MCFG_PALETTE_INIT(wolfpack)
+ MCFG_VIDEO_START(wolfpack)
+ MCFG_VIDEO_UPDATE(wolfpack)
+ MCFG_VIDEO_EOF(wolfpack)
/* sound hardware */
- MDRV_SOUND_ADD("speech", S14001A, 20000) /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("speech", S14001A, 20000) /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index 1c7ca2608f8..6fcac599d52 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -247,36 +247,36 @@ GFXDECODE_END
static MACHINE_CONFIG_START( wrally, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(wrally_map)
- MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(wrally_map)
+ MCFG_CPU_VBLANK_INT("screen", irq6_line_hold)
- MDRV_CPU_ADD("mcu", DS5002FP, XTAL_24MHz/2) /* verified on pcb */
- MDRV_CPU_CONFIG(dallas_config)
- MDRV_CPU_PROGRAM_MAP(dallas_rom)
- MDRV_CPU_IO_MAP(dallas_ram)
+ MCFG_CPU_ADD("mcu", DS5002FP, XTAL_24MHz/2) /* verified on pcb */
+ MCFG_CPU_CONFIG(dallas_config)
+ MCFG_CPU_PROGRAM_MAP(dallas_rom)
+ MCFG_CPU_IO_MAP(dallas_ram)
- MDRV_QUANTUM_TIME(HZ(38400)) /* heavy sync */
+ MCFG_QUANTUM_TIME(HZ(38400)) /* heavy sync */
/* 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*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(8, 24*16-8-1, 16, 16*16-8-1)
+ 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*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(8, 24*16-8-1, 16, 16*16-8-1)
- MDRV_GFXDECODE(wrally)
- MDRV_PALETTE_LENGTH(1024*8)
+ MCFG_GFXDECODE(wrally)
+ MCFG_PALETTE_LENGTH(1024*8)
- MDRV_VIDEO_START(wrally)
- MDRV_VIDEO_UPDATE(wrally)
+ MCFG_VIDEO_START(wrally)
+ MCFG_VIDEO_UPDATE(wrally)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index a4af689489c..110f3f7a453 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -430,35 +430,35 @@ static const ym2151_interface ym2151_config =
static MACHINE_CONFIG_START( wwfsstar, wwfsstar_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", wwfsstar_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", wwfsstar_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 320, 0, 256, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 320, 0, 256, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
- MDRV_GFXDECODE(wwfsstar)
- MDRV_PALETTE_LENGTH(384)
+ MCFG_GFXDECODE(wwfsstar)
+ MCFG_PALETTE_LENGTH(384)
- MDRV_VIDEO_START(wwfsstar)
- MDRV_VIDEO_UPDATE(wwfsstar)
+ MCFG_VIDEO_START(wwfsstar)
+ MCFG_VIDEO_UPDATE(wwfsstar)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
/*******************************************************************************
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index c5628834007..0e4db8e59e4 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -393,41 +393,41 @@ static VIDEO_EOF( wwfwfest )
static MACHINE_CONFIG_START( wwfwfest, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 24 crystal, 12 rated chip */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", wwfwfest_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 24 crystal, 12 rated chip */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", wwfwfest_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
- MDRV_GFXDECODE(wwfwfest)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(wwfwfest)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(wwfwfest)
- MDRV_VIDEO_EOF(wwfwfest)
- MDRV_VIDEO_UPDATE(wwfwfest)
+ MCFG_VIDEO_START(wwfwfest)
+ MCFG_VIDEO_EOF(wwfwfest)
+ MCFG_VIDEO_UPDATE(wwfwfest)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.45)
- MDRV_SOUND_ROUTE(1, "mono", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.45)
+ MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MDRV_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) /* Verified - Pin 7 tied to +5VDC */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) /* Verified - Pin 7 tied to +5VDC */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wwfwfstb, wwfwfest )
- MDRV_VIDEO_START(wwfwfstb)
+ MCFG_VIDEO_START(wwfwfstb)
MACHINE_CONFIG_END
/*******************************************************************************
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 34ee9b16ae6..a09750b153c 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -586,54 +586,54 @@ static MACHINE_START( xsleena )
static MACHINE_CONFIG_START( xsleena, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", xain_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", M6809, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", xain_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("sub", M6809, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cpu_map_B)
+ MCFG_CPU_ADD("sub", M6809, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cpu_map_B)
- MDRV_CPU_ADD("audiocpu", M6809, CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", M6809, CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_ADD("mcu", M68705, MCU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", M68705, MCU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_MACHINE_START(xsleena)
+ MCFG_MACHINE_START(xsleena)
- MDRV_QUANTUM_PERFECT_CPU("maincpu")
+ MCFG_QUANTUM_PERFECT_CPU("maincpu")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 8, 248) /* based on ddragon driver */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 384, 0, 256, 272, 8, 248) /* based on ddragon driver */
- MDRV_GFXDECODE(xain)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(xain)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(xain)
- MDRV_VIDEO_UPDATE(xain)
+ MCFG_VIDEO_START(xain)
+ MCFG_VIDEO_UPDATE(xain)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, MCU_CLOCK)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 0.40)
-
- MDRV_SOUND_ADD("ym2", YM2203, MCU_CLOCK)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
- MDRV_SOUND_ROUTE(2, "mono", 0.50)
- MDRV_SOUND_ROUTE(3, "mono", 0.40)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, MCU_CLOCK)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
+
+ MCFG_SOUND_ADD("ym2", YM2203, MCU_CLOCK)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_SOUND_ROUTE(2, "mono", 0.50)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( xsleenab, xsleena )
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index b22c708b9c7..dd62069bd8b 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -522,69 +522,69 @@ static MACHINE_RESET( xexex )
static MACHINE_CONFIG_START( xexex, xexex_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) // 16MHz (32MHz xtal)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(xexex_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) // 16MHz (32MHz xtal)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(xexex_interrupt,2)
// 8MHz (PCB shows one 32MHz/18.432MHz xtal, reference: www.system16.com)
// more likely 32MHz since 18.432MHz yields 4.608MHz(too slow) or 9.216MHz(too fast) with integer divisors
- MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(1920))
+ MCFG_QUANTUM_TIME(HZ(1920))
- MDRV_MACHINE_START(xexex)
- MDRV_MACHINE_RESET(xexex)
+ MCFG_MACHINE_START(xexex)
+ MCFG_MACHINE_RESET(xexex)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
-// MDRV_SCREEN_REFRESH_RATE(8000000/512/288)
- MDRV_SCREEN_RAW_PARAMS(8000000, 384+33+40+55, 0, 383, 256+12+6+14, 0, 255)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(40, 40+384-1, 0, 0+256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+// MCFG_SCREEN_REFRESH_RATE(8000000/512/288)
+ MCFG_SCREEN_RAW_PARAMS(8000000, 384+33+40+55, 0, 383, 256+12+6+14, 0, 255)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(40, 40+384-1, 0, 0+256-1)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(xexex)
- MDRV_VIDEO_UPDATE(xexex)
+ MCFG_VIDEO_START(xexex)
+ MCFG_VIDEO_UPDATE(xexex)
- MDRV_K056832_ADD("k056832", xexex_k056832_intf)
- MDRV_K053246_ADD("k053246", xexex_k053246_intf)
- MDRV_K053250_ADD("k053250", xexex_k053250_intf)
- MDRV_K053251_ADD("k053251")
- MDRV_K053252_ADD("k053252")
- MDRV_K054338_ADD("k054338", xexex_k054338_intf)
+ MCFG_K056832_ADD("k056832", xexex_k056832_intf)
+ MCFG_K053246_ADD("k053246", xexex_k053246_intf)
+ MCFG_K053250_ADD("k053250", xexex_k053250_intf)
+ MCFG_K053251_ADD("k053251")
+ MCFG_K053252_ADD("k053252")
+ MCFG_K054338_ADD("k054338", xexex_k054338_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "filter1l", 0.50)
- MDRV_SOUND_ROUTE(0, "filter1r", 0.50)
- MDRV_SOUND_ROUTE(1, "filter2l", 0.50)
- MDRV_SOUND_ROUTE(1, "filter2r", 0.50)
-
- MDRV_SOUND_ADD("k054539", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("filter1l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter1r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("filter2l", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("filter2r", FILTER_VOLUME, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "filter1l", 0.50)
+ MCFG_SOUND_ROUTE(0, "filter1r", 0.50)
+ MCFG_SOUND_ROUTE(1, "filter2l", 0.50)
+ MCFG_SOUND_ROUTE(1, "filter2r", 0.50)
+
+ MCFG_SOUND_ADD("k054539", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("filter1l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter1r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("filter2l", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("filter2r", FILTER_VOLUME, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index ffeee993334..37a7f248431 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -369,45 +369,45 @@ static const k053247_interface xmen_k053246_intf =
static MACHINE_CONFIG_START( xmen, xmen_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(xmen_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(xmen_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_16MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(xmen)
- MDRV_MACHINE_RESET(xmen)
+ MCFG_MACHINE_START(xmen)
+ MCFG_MACHINE_RESET(xmen)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.17) /* 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(13*8, (64-13)*8-1, 2*8, 30*8-1 ) /* correct, same issue of TMNT2 */
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.17) /* 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(13*8, (64-13)*8-1, 2*8, 30*8-1 ) /* correct, same issue of TMNT2 */
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(xmen)
+ MCFG_VIDEO_UPDATE(xmen)
- MDRV_K052109_ADD("k052109", xmen_k052109_intf)
- MDRV_K053246_ADD("k053246", xmen_k053246_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K052109_ADD("k052109", xmen_k052109_intf)
+ MCFG_K053246_ADD("k053246", xmen_k053246_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_SOUND_ADD("k054539", K054539, 48000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("k054539", K054539, 48000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -458,55 +458,55 @@ static const k053247_interface xmen6p_k053246_intf =
static MACHINE_CONFIG_START( xmen6p, xmen_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(6p_main_map)
- MDRV_CPU_VBLANK_INT_HACK(xmen6p_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(6p_main_map)
+ MCFG_CPU_VBLANK_INT_HACK(xmen6p_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80,8000000) /* verified with M1, guessed but accurate */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,8000000) /* verified with M1, guessed but accurate */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(xmen6p)
- MDRV_MACHINE_RESET(xmen6p)
+ MCFG_MACHINE_START(xmen6p)
+ MCFG_MACHINE_RESET(xmen6p)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_PALETTE_LENGTH(2048)
- MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
-
- MDRV_SCREEN_ADD("lscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(12*8, 48*8-1, 2*8, 30*8-1)
-
- MDRV_SCREEN_ADD("rscreen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(16*8, 52*8-1, 2*8, 30*8-1)
-
- MDRV_VIDEO_START(xmen6p)
- MDRV_VIDEO_UPDATE(xmen6p)
- MDRV_VIDEO_EOF(xmen6p)
-
- MDRV_K052109_ADD("k052109", xmen_k052109_intf)
- MDRV_K053246_ADD("k053246", xmen6p_k053246_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_PALETTE_LENGTH(2048)
+ MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
+
+ MCFG_SCREEN_ADD("lscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(12*8, 48*8-1, 2*8, 30*8-1)
+
+ MCFG_SCREEN_ADD("rscreen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(16*8, 52*8-1, 2*8, 30*8-1)
+
+ MCFG_VIDEO_START(xmen6p)
+ MCFG_VIDEO_UPDATE(xmen6p)
+ MCFG_VIDEO_EOF(xmen6p)
+
+ MCFG_K052109_ADD("k052109", xmen_k052109_intf)
+ MCFG_K053246_ADD("k053246", xmen6p_k053246_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MDRV_SOUND_ADD("k054539", K054539, 48000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("k054539", K054539, 48000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index 7f05eaa8f3b..ef0f3d8a4b4 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -175,34 +175,34 @@ static INTERRUPT_GEN( xorworld_interrupt )
static MACHINE_CONFIG_START( xorworld, xorworld_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", M68000, 10000000) // 10 MHz
- MDRV_CPU_PROGRAM_MAP(xorworld_map)
- MDRV_CPU_VBLANK_INT_HACK(xorworld_interrupt, 4) // 1 IRQ2 + 1 IRQ4 + 1 IRQ6
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) // 10 MHz
+ MCFG_CPU_PROGRAM_MAP(xorworld_map)
+ MCFG_CPU_VBLANK_INT_HACK(xorworld_interrupt, 4) // 1 IRQ2 + 1 IRQ4 + 1 IRQ6
- MDRV_QUANTUM_TIME(HZ(60))
+ MCFG_QUANTUM_TIME(HZ(60))
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
// 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(0*8, 32*8-1, 2*8, 30*8-1)
+ 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(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(xorworld)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(xorworld)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(xorworld)
- MDRV_VIDEO_START(xorworld)
- MDRV_VIDEO_UPDATE(xorworld)
+ MCFG_PALETTE_INIT(xorworld)
+ MCFG_VIDEO_START(xorworld)
+ MCFG_VIDEO_UPDATE(xorworld)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("saa", SAA1099, 8000000 /* guess */)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("saa", SAA1099, 8000000 /* guess */)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index f2afb122793..296d7bf7202 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -323,29 +323,29 @@ static const tms34010_config tms_config =
static MACHINE_CONFIG_START( xtheball, driver_device )
- MDRV_CPU_ADD("maincpu", TMS34010, 40000000)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_PERIODIC_INT(irq1_line_hold, 15000)
+ MCFG_CPU_ADD("maincpu", TMS34010, 40000000)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_PERIODIC_INT(irq1_line_hold, 15000)
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_NVRAM_ADD_1FILL("nvram")
- MDRV_TICKET_DISPENSER_ADD("ticket", 100, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
+ MCFG_TICKET_DISPENSER_ADD("ticket", 100, TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(10000000, 640, 114, 626, 257, 24, 248)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(10000000, 640, 114, 626, 257, 24, 248)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- 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/xtom3d.c b/src/mame/drivers/xtom3d.c
index e9e5e7ff2ed..0e8de971ec4 100644
--- a/src/mame/drivers/xtom3d.c
+++ b/src/mame/drivers/xtom3d.c
@@ -67,21 +67,21 @@ static INPUT_PORTS_START( xtom3d )
INPUT_PORTS_END
static MACHINE_CONFIG_START( xtom3d, driver_device )
- MDRV_CPU_ADD("maincpu", PENTIUM, 450000000) // actually Pentium II 450
- MDRV_CPU_PROGRAM_MAP(xtom3d_map)
- MDRV_CPU_IO_MAP(xtom3d_io)
+ MCFG_CPU_ADD("maincpu", PENTIUM, 450000000) // actually Pentium II 450
+ MCFG_CPU_PROGRAM_MAP(xtom3d_map)
+ MCFG_CPU_IO_MAP(xtom3d_io)
/* 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(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
- MDRV_PALETTE_LENGTH(16)
-
- MDRV_VIDEO_START(xtom3d)
- MDRV_VIDEO_UPDATE(xtom3d)
+ 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(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 199)
+ MCFG_PALETTE_LENGTH(16)
+
+ MCFG_VIDEO_START(xtom3d)
+ MCFG_VIDEO_UPDATE(xtom3d)
MACHINE_CONFIG_END
ROM_START( xtom3d )
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index f0d2c448d00..204d720b8b5 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -290,48 +290,48 @@ static const ym2203_interface ym2203_interface_2 =
static MACHINE_CONFIG_START( xxmissio, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,12000000/4) /* 3.0MHz */
- MDRV_CPU_PROGRAM_MAP(map1)
- MDRV_CPU_VBLANK_INT("screen", xxmissio_interrupt_m)
+ MCFG_CPU_ADD("maincpu", Z80,12000000/4) /* 3.0MHz */
+ MCFG_CPU_PROGRAM_MAP(map1)
+ MCFG_CPU_VBLANK_INT("screen", xxmissio_interrupt_m)
- MDRV_CPU_ADD("sub", Z80,12000000/4) /* 3.0MHz */
- MDRV_CPU_PROGRAM_MAP(map2)
- MDRV_CPU_VBLANK_INT_HACK(xxmissio_interrupt_s,2)
+ MCFG_CPU_ADD("sub", Z80,12000000/4) /* 3.0MHz */
+ MCFG_CPU_PROGRAM_MAP(map2)
+ MCFG_CPU_VBLANK_INT_HACK(xxmissio_interrupt_s,2)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
- MDRV_MACHINE_START(xxmissio)
+ MCFG_MACHINE_START(xxmissio)
/* 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(0*8, 64*8-1, 4*8, 28*8-1)
+ 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(0*8, 64*8-1, 4*8, 28*8-1)
- MDRV_GFXDECODE(xxmissio)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(xxmissio)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(xxmissio)
- MDRV_VIDEO_UPDATE(xxmissio)
+ MCFG_VIDEO_START(xxmissio)
+ MCFG_VIDEO_UPDATE(xxmissio)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 12000000/8)
- MDRV_SOUND_CONFIG(ym2203_interface_1)
- 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.40)
-
- MDRV_SOUND_ADD("ym2", YM2203, 12000000/8)
- MDRV_SOUND_CONFIG(ym2203_interface_2)
- 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.40)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 12000000/8)
+ MCFG_SOUND_CONFIG(ym2203_interface_1)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 12000000/8)
+ MCFG_SOUND_CONFIG(ym2203_interface_2)
+ MCFG_SOUND_ROUTE(0, "mono", 0.15)
+ MCFG_SOUND_ROUTE(1, "mono", 0.15)
+ MCFG_SOUND_ROUTE(2, "mono", 0.15)
+ MCFG_SOUND_ROUTE(3, "mono", 0.40)
MACHINE_CONFIG_END
/****************************************************************************/
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index 51bb0726ad3..a04d16605d1 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -194,30 +194,30 @@ GFXDECODE_END
static MACHINE_CONFIG_START( xybots, xybots_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(xybots)
- MDRV_MACHINE_RESET(xybots)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(xybots)
+ MCFG_MACHINE_RESET(xybots)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(xybots)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(xybots)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses a SYNGEN chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
- MDRV_VIDEO_START(xybots)
- MDRV_VIDEO_UPDATE(xybots)
+ MCFG_VIDEO_START(xybots)
+ MCFG_VIDEO_UPDATE(xybots)
/* sound hardware */
- MDRV_FRAGMENT_ADD(jsa_i_stereo_swapped)
+ MCFG_FRAGMENT_ADD(jsa_i_stereo_swapped)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index e0c6af61f6a..f57a681aabb 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -217,35 +217,35 @@ GFXDECODE_END
static MACHINE_CONFIG_START( xyonix, xyonix_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,16000000 / 4) /* 4 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(port_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_PERIODIC_INT(irq0_line_assert,4*60) /* ?? controls music tempo */
+ MCFG_CPU_ADD("maincpu", Z80,16000000 / 4) /* 4 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(port_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_PERIODIC_INT(irq0_line_assert,4*60) /* ?? controls music tempo */
/* 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(80*4, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 80*4-1, 0, 28*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(80*4, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 80*4-1, 0, 28*8-1)
- MDRV_GFXDECODE(xyonix)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(xyonix)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(xyonix)
- MDRV_VIDEO_START(xyonix)
- MDRV_VIDEO_UPDATE(xyonix)
+ MCFG_PALETTE_INIT(xyonix)
+ MCFG_VIDEO_START(xyonix)
+ MCFG_VIDEO_UPDATE(xyonix)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, 16000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76496, 16000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76496, 16000000/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76496, 16000000/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* ROM Loading ***************************************************************/
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index 4f0957e7aa9..26c7cb3320a 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -259,39 +259,39 @@ static MACHINE_RESET( yiear )
static MACHINE_CONFIG_START( yiear, yiear_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809,XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_PERIODIC_INT(yiear_nmi_interrupt,480) /* music tempo (correct frequency unknown) */
+ MCFG_CPU_ADD("maincpu", M6809,XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_PERIODIC_INT(yiear_nmi_interrupt,480) /* music tempo (correct frequency unknown) */
- MDRV_MACHINE_START(yiear)
- MDRV_MACHINE_RESET(yiear)
+ MCFG_MACHINE_START(yiear)
+ MCFG_MACHINE_RESET(yiear)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.58) /* verified on pcb */
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.58) /* verified on pcb */
+ 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)
- MDRV_GFXDECODE(yiear)
- MDRV_PALETTE_LENGTH(32)
+ MCFG_GFXDECODE(yiear)
+ MCFG_PALETTE_LENGTH(32)
- MDRV_PALETTE_INIT(yiear)
- MDRV_VIDEO_START(yiear)
- MDRV_VIDEO_UPDATE(yiear)
+ MCFG_PALETTE_INIT(yiear)
+ MCFG_VIDEO_START(yiear)
+ MCFG_VIDEO_UPDATE(yiear)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MDRV_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 5a295c87465..0e4a5505c56 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -591,42 +591,42 @@ static const ym3812_interface magicbub_ym3812_intf =
static MACHINE_CONFIG_START( magicbub, yunsun16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_port_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_port_map)
- MDRV_MACHINE_START(yunsun16)
- MDRV_MACHINE_RESET(yunsun16)
+ MCFG_MACHINE_START(yunsun16)
+ MCFG_MACHINE_RESET(yunsun16)
/* 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(0x180, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0+0x20, 0x180-1-0x20, 0, 0xe0-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(0x180, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0+0x20, 0x180-1-0x20, 0, 0xe0-1)
- MDRV_GFXDECODE(yunsun16)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(yunsun16)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(yunsun16)
- MDRV_VIDEO_UPDATE(yunsun16)
+ MCFG_VIDEO_START(yunsun16)
+ MCFG_VIDEO_UPDATE(yunsun16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_CONFIG(magicbub_ym3812_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_CONFIG(magicbub_ym3812_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -637,33 +637,33 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( shocking, yunsun16_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_MACHINE_START(yunsun16)
- MDRV_MACHINE_RESET(yunsun16)
+ MCFG_MACHINE_START(yunsun16)
+ MCFG_MACHINE_RESET(yunsun16)
/* 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(0x180, 0xe0)
- MDRV_SCREEN_VISIBLE_AREA(0, 0x180-1-4, 0, 0xe0-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(0x180, 0xe0)
+ MCFG_SCREEN_VISIBLE_AREA(0, 0x180-1-4, 0, 0xe0-1)
- MDRV_GFXDECODE(yunsun16)
- MDRV_PALETTE_LENGTH(8192)
+ MCFG_GFXDECODE(yunsun16)
+ MCFG_PALETTE_LENGTH(8192)
- MDRV_VIDEO_START(yunsun16)
- MDRV_VIDEO_UPDATE(yunsun16)
+ MCFG_VIDEO_START(yunsun16)
+ MCFG_VIDEO_UPDATE(yunsun16)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ 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/yunsung8.c b/src/mame/drivers/yunsung8.c
index 92341772b50..c411abb12f5 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -503,43 +503,43 @@ static MACHINE_RESET( yunsung8 )
static MACHINE_CONFIG_START( yunsung8, yunsung8_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* Z80B */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* No nmi routine */
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* Z80B */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* No nmi routine */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI caused by the MSM5205? */
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* NMI caused by the MSM5205? */
- MDRV_MACHINE_START(yunsung8)
- MDRV_MACHINE_RESET(yunsung8)
+ MCFG_MACHINE_START(yunsung8)
+ MCFG_MACHINE_RESET(yunsung8)
/* 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+64, 512-64-1, 0+8, 256-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(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0+64, 512-64-1, 0+8, 256-8-1)
- MDRV_GFXDECODE(yunsung8)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(yunsung8)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(yunsung8)
- MDRV_VIDEO_UPDATE(yunsung8)
+ MCFG_VIDEO_START(yunsung8)
+ MCFG_VIDEO_UPDATE(yunsung8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(yunsung8_msm5205_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(yunsung8_msm5205_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index 80de36052aa..30d3f491e5f 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -234,30 +234,30 @@ GFXDECODE_END
static MACHINE_CONFIG_START( tinvader, zac2650_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", S2650, 3800000/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(port_map)
+ MCFG_CPU_ADD("maincpu", S2650, 3800000/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(port_map)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(55)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1041))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(30*24, 32*24)
- MDRV_SCREEN_VISIBLE_AREA(0, 719, 0, 767)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(55)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1041))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(30*24, 32*24)
+ MCFG_SCREEN_VISIBLE_AREA(0, 719, 0, 767)
- MDRV_GFXDECODE(tinvader)
- MDRV_PALETTE_LENGTH(4)
+ MCFG_GFXDECODE(tinvader)
+ MCFG_PALETTE_LENGTH(4)
- MDRV_PALETTE_INIT(zac2650)
- MDRV_VIDEO_START(tinvader)
- MDRV_VIDEO_UPDATE(tinvader)
+ MCFG_PALETTE_INIT(zac2650)
+ MCFG_VIDEO_START(tinvader)
+ MCFG_VIDEO_UPDATE(tinvader)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("s2636snd", S2636_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("s2636snd", S2636_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
static WRITE8_HANDLER( tinvader_sound_w )
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 114f19a1de0..ff1eecdb68e 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -579,57 +579,57 @@ static const tms5220_interface tms5220_config =
static MACHINE_CONFIG_START( zaccaria, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_QUANTUM_TIME(HZ(1000000))
+ MCFG_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_QUANTUM_TIME(HZ(1000000))
- MDRV_CPU_ADD("audiocpu", M6802,XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map_1)
- MDRV_CPU_PERIODIC_INT(zaccaria_cb1_toggle,(double)XTAL_3_579545MHz/4096)
- MDRV_QUANTUM_TIME(HZ(1000000))
+ MCFG_CPU_ADD("audiocpu", M6802,XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map_1)
+ MCFG_CPU_PERIODIC_INT(zaccaria_cb1_toggle,(double)XTAL_3_579545MHz/4096)
+ MCFG_QUANTUM_TIME(HZ(1000000))
- MDRV_CPU_ADD("audio2", M6802,XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map_2)
- MDRV_QUANTUM_TIME(HZ(1000000))
+ MCFG_CPU_ADD("audio2", M6802,XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map_2)
+ MCFG_QUANTUM_TIME(HZ(1000000))
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_config )
- MDRV_PIA6821_ADD( "pia0", pia_0_config )
- MDRV_PIA6821_ADD( "pia1", pia_1_config )
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_config )
+ MCFG_PIA6821_ADD( "pia0", pia_0_config )
+ MCFG_PIA6821_ADD( "pia1", pia_1_config )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60.57) /* verified on pcb */
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60.57) /* verified on pcb */
+ 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)
- MDRV_GFXDECODE(zaccaria)
- MDRV_PALETTE_LENGTH(32*8+32*8)
+ MCFG_GFXDECODE(zaccaria)
+ MCFG_PALETTE_LENGTH(32*8+32*8)
- MDRV_PALETTE_INIT(zaccaria)
- MDRV_VIDEO_START(zaccaria)
- MDRV_VIDEO_UPDATE(zaccaria)
+ MCFG_PALETTE_INIT(zaccaria)
+ MCFG_VIDEO_START(zaccaria)
+ MCFG_VIDEO_UPDATE(zaccaria)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* There is no xtal, the clock is obtained from a RC oscillator as shown in the TMS5220 datasheet (R=100kOhm C=22pF) */
/* 162kHz measured on pin 3 20 minutesa fter power on. Clock would then be 162*4=648kHz. */
- MDRV_SOUND_ADD("tms", TMS5200, 649200) /* ROMCLK pin measured at 162.3Khz, OSC is exactly *4 of that) */
- MDRV_SOUND_CONFIG(tms5220_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("tms", TMS5200, 649200) /* ROMCLK pin measured at 162.3Khz, OSC is exactly *4 of that) */
+ MCFG_SOUND_CONFIG(tms5220_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 95dee84c21b..0c6ff98df16 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -937,87 +937,87 @@ GFXDECODE_END
static MACHINE_CONFIG_START( root, zaxxon_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/16)
- MDRV_CPU_PROGRAM_MAP(zaxxon_map)
- MDRV_CPU_VBLANK_INT("screen", vblank_int)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/16)
+ MCFG_CPU_PROGRAM_MAP(zaxxon_map)
+ MCFG_CPU_VBLANK_INT("screen", vblank_int)
- MDRV_MACHINE_START(zaxxon)
+ MCFG_MACHINE_START(zaxxon)
- MDRV_PPI8255_ADD( "ppi8255", zaxxon_ppi_intf )
+ MCFG_PPI8255_ADD( "ppi8255", zaxxon_ppi_intf )
/* video hardware */
- MDRV_GFXDECODE(zaxxon)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(zaxxon)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
- MDRV_PALETTE_INIT(zaxxon)
- MDRV_VIDEO_START(zaxxon)
- MDRV_VIDEO_UPDATE(zaxxon)
+ MCFG_PALETTE_INIT(zaxxon)
+ MCFG_VIDEO_START(zaxxon)
+ MCFG_VIDEO_UPDATE(zaxxon)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( zaxxon, root )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(zaxxon_samples)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(zaxxon_samples)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( futspy, root )
/* video hardware */
- MDRV_VIDEO_UPDATE(futspy)
+ MCFG_VIDEO_UPDATE(futspy)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(zaxxon_samples)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(zaxxon_samples)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( razmataz, root )
- MDRV_MACHINE_RESET(razmataz)
+ MCFG_MACHINE_RESET(razmataz)
/* video hardware */
- MDRV_VIDEO_START(razmataz)
- MDRV_VIDEO_UPDATE(razmataz)
+ MCFG_VIDEO_START(razmataz)
+ MCFG_VIDEO_UPDATE(razmataz)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD(sega_universal_sound_board_rom)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_FRAGMENT_ADD(sega_universal_sound_board_rom)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( congo, root )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(congo_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(congo_map)
- MDRV_PPI8255_RECONFIG( "ppi8255", congo_ppi_intf )
+ MCFG_PPI8255_RECONFIG( "ppi8255", congo_ppi_intf )
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CLOCK)
- MDRV_CPU_PROGRAM_MAP(congo_sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)SOUND_CLOCK/16/16/16/4)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(congo_sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, (double)SOUND_CLOCK/16/16/16/4)
/* video hardware */
- MDRV_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(congo)
- MDRV_VIDEO_UPDATE(congo)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_VIDEO_START(congo)
+ MCFG_VIDEO_UPDATE(congo)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76496, SOUND_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn1", SN76496, SOUND_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("sn2", SN76496, SOUND_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("sn2", SN76496, SOUND_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_FRAGMENT_ADD(congo_samples)
+ MCFG_FRAGMENT_ADD(congo_samples)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index 0e4273f9588..998f1c6df83 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -187,37 +187,37 @@ static MACHINE_RESET( zerozone )
static MACHINE_CONFIG_START( zerozone, zerozone_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 1000000) /* 1 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 1000000) /* 1 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_START(zerozone)
- MDRV_MACHINE_RESET(zerozone)
+ MCFG_MACHINE_START(zerozone)
+ MCFG_MACHINE_RESET(zerozone)
/* 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(1*8, 47*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(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 47*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(zerozone)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(zerozone)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_VIDEO_START(zerozone)
- MDRV_VIDEO_UPDATE(zerozone)
+ MCFG_VIDEO_START(zerozone)
+ MCFG_VIDEO_UPDATE(zerozone)
/* 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/zn.c b/src/mame/drivers/zn.c
index 1da61e76361..e5da9544f6c 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -508,70 +508,70 @@ static void zn_machine_init( running_machine *machine )
static MACHINE_CONFIG_START( zn1_1mb_vram, zn_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
- MDRV_CPU_PROGRAM_MAP( zn_map)
- MDRV_CPU_VBLANK_INT("screen", psx_vblank)
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_67_7376MHz )
+ MCFG_CPU_PROGRAM_MAP( zn_map)
+ MCFG_CPU_VBLANK_INT("screen", psx_vblank)
/* 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( 1024, 512 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ 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( 1024, 512 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type2 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
- MDRV_SOUND_CONFIG( psxspu_interface )
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.35)
+ MCFG_SOUND_ADD( "spu", PSXSPU, 0 )
+ MCFG_SOUND_CONFIG( psxspu_interface )
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
- MDRV_AT28C16_ADD( "at28c16", NULL )
+ MCFG_AT28C16_ADD( "at28c16", NULL )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( zn1_2mb_vram, zn1_1mb_vram )
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_SIZE( 1024, 1024 )
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_SIZE( 1024, 1024 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( zn2, zn_state )
/* basic machine hardware */
- MDRV_CPU_ADD( "maincpu", PSXCPU, XTAL_100MHz )
- MDRV_CPU_PROGRAM_MAP( zn_map)
- MDRV_CPU_VBLANK_INT("screen", psx_vblank)
+ MCFG_CPU_ADD( "maincpu", PSXCPU, XTAL_100MHz )
+ MCFG_CPU_PROGRAM_MAP( zn_map)
+ MCFG_CPU_VBLANK_INT("screen", psx_vblank)
/* 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( 1024, 1024 )
- MDRV_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
+ 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( 1024, 1024 )
+ MCFG_SCREEN_VISIBLE_AREA( 0, 639, 0, 479 )
- MDRV_PALETTE_LENGTH( 65536 )
+ MCFG_PALETTE_LENGTH( 65536 )
- MDRV_PALETTE_INIT( psx )
- MDRV_VIDEO_START( psx_type2 )
- MDRV_VIDEO_UPDATE( psx )
+ MCFG_PALETTE_INIT( psx )
+ MCFG_VIDEO_START( psx_type2 )
+ MCFG_VIDEO_UPDATE( psx )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD( "spu", PSXSPU, 0 )
- MDRV_SOUND_CONFIG( psxspu_interface )
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.35)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.35)
+ MCFG_SOUND_ADD( "spu", PSXSPU, 0 )
+ MCFG_SOUND_CONFIG( psxspu_interface )
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
- MDRV_AT28C16_ADD( "at28c16", NULL )
+ MCFG_AT28C16_ADD( "at28c16", NULL )
MACHINE_CONFIG_END
/*
@@ -761,30 +761,30 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( coh1000c, zn1_1mb_vram )
- MDRV_CPU_ADD( "audiocpu", Z80, 8000000 ) /* 8MHz ?? */
- MDRV_CPU_PROGRAM_MAP( qsound_map)
- MDRV_CPU_IO_MAP( qsound_portmap)
- MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
+ MCFG_CPU_ADD( "audiocpu", Z80, 8000000 ) /* 8MHz ?? */
+ MCFG_CPU_PROGRAM_MAP( qsound_map)
+ MCFG_CPU_IO_MAP( qsound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
- MDRV_MACHINE_RESET( coh1000c )
+ MCFG_MACHINE_RESET( coh1000c )
- MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( coh1002c, zn1_2mb_vram )
- MDRV_CPU_ADD( "audiocpu", Z80, 8000000 ) /* 8MHz ?? */
- MDRV_CPU_PROGRAM_MAP( qsound_map)
- MDRV_CPU_IO_MAP( qsound_portmap)
- MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
+ MCFG_CPU_ADD( "audiocpu", Z80, 8000000 ) /* 8MHz ?? */
+ MCFG_CPU_PROGRAM_MAP( qsound_map)
+ MCFG_CPU_IO_MAP( qsound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
- MDRV_MACHINE_RESET( coh1000c )
+ MCFG_MACHINE_RESET( coh1000c )
- MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/*
@@ -955,16 +955,16 @@ static MACHINE_RESET( coh3002c )
static MACHINE_CONFIG_DERIVED( coh3002c, zn2 )
- MDRV_CPU_ADD("audiocpu", Z80, 8000000 ) /* 8MHz ?? */
- MDRV_CPU_PROGRAM_MAP( qsound_map)
- MDRV_CPU_IO_MAP( qsound_portmap)
- MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000 ) /* 8MHz ?? */
+ MCFG_CPU_PROGRAM_MAP( qsound_map)
+ MCFG_CPU_IO_MAP( qsound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */
- MDRV_MACHINE_RESET( coh3002c )
+ MCFG_MACHINE_RESET( coh3002c )
- MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK )
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
/*
@@ -1271,21 +1271,21 @@ static const tc0140syt_interface coh1000ta_tc0140syt_intf =
static MACHINE_CONFIG_DERIVED( coh1000ta, zn1_1mb_vram )
- MDRV_CPU_ADD("audiocpu", Z80, 16000000 / 4 ) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP( fx1a_sound_map)
- MDRV_MACHINE_RESET( coh1000ta )
- MDRV_NVRAM_ADD_0FILL("eeprom1")
+ MCFG_CPU_ADD("audiocpu", Z80, 16000000 / 4 ) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP( fx1a_sound_map)
+ MCFG_MACHINE_RESET( coh1000ta )
+ MCFG_NVRAM_ADD_0FILL("eeprom1")
- MDRV_SOUND_ADD("ymsnd", YM2610B, 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_SOUND_ADD("ymsnd", YM2610B, 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)
- MDRV_MB3773_ADD("mb3773")
+ MCFG_MB3773_ADD("mb3773")
- MDRV_TC0140SYT_ADD("tc0140syt", coh1000ta_tc0140syt_intf)
+ MCFG_TC0140SYT_ADD("tc0140syt", coh1000ta_tc0140syt_intf)
MACHINE_CONFIG_END
static WRITE32_HANDLER( taitofx1b_volume_w )
@@ -1338,13 +1338,13 @@ static MACHINE_RESET( coh1000tb )
static MACHINE_CONFIG_DERIVED( coh1000tb, zn1_2mb_vram )
- MDRV_MACHINE_RESET( coh1000tb )
- MDRV_NVRAM_ADD_0FILL("eeprom1")
- MDRV_NVRAM_ADD_0FILL("eeprom2")
+ MCFG_MACHINE_RESET( coh1000tb )
+ MCFG_NVRAM_ADD_0FILL("eeprom1")
+ MCFG_NVRAM_ADD_0FILL("eeprom2")
- MDRV_MB3773_ADD("mb3773")
+ MCFG_MB3773_ADD("mb3773")
- MDRV_FRAGMENT_ADD( taito_zoom_sound )
+ MCFG_FRAGMENT_ADD( taito_zoom_sound )
MACHINE_CONFIG_END
/*
@@ -1526,9 +1526,9 @@ static MACHINE_RESET( coh1000w )
static MACHINE_CONFIG_DERIVED( coh1000w, zn1_2mb_vram )
- MDRV_MACHINE_RESET( coh1000w )
+ MCFG_MACHINE_RESET( coh1000w )
- MDRV_IDE_CONTROLLER_ADD("ide", atpsx_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", atpsx_interrupt)
MACHINE_CONFIG_END
/*
@@ -1719,14 +1719,14 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( coh1002e, zn1_2mb_vram )
- MDRV_CPU_ADD("audiocpu", M68000, 12000000 )
- MDRV_CPU_PROGRAM_MAP( psarc_snd_map)
+ MCFG_CPU_ADD("audiocpu", M68000, 12000000 )
+ MCFG_CPU_PROGRAM_MAP( psarc_snd_map)
- MDRV_MACHINE_RESET( coh1002e )
+ MCFG_MACHINE_RESET( coh1002e )
- MDRV_SOUND_ADD( "ymf", YMF271, 16934400 )
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD( "ymf", YMF271, 16934400 )
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1859,7 +1859,7 @@ static MACHINE_RESET( bam2 )
static MACHINE_CONFIG_DERIVED( bam2, zn1_2mb_vram )
- MDRV_MACHINE_RESET( bam2 )
+ MCFG_MACHINE_RESET( bam2 )
MACHINE_CONFIG_END
/*
@@ -2200,17 +2200,17 @@ static MACHINE_RESET( coh1000a )
static MACHINE_CONFIG_DERIVED( coh1000a, zn1_2mb_vram )
- MDRV_MACHINE_RESET( coh1000a )
+ MCFG_MACHINE_RESET( coh1000a )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( coh1000a_ide, zn1_2mb_vram )
- MDRV_CPU_MODIFY( "maincpu" )
- MDRV_CPU_VBLANK_INT("screen", jdredd_vblank)
+ MCFG_CPU_MODIFY( "maincpu" )
+ MCFG_CPU_VBLANK_INT("screen", jdredd_vblank)
- MDRV_MACHINE_RESET( coh1000a )
+ MCFG_MACHINE_RESET( coh1000a )
- MDRV_IDE_CONTROLLER_ADD("ide", jdredd_ide_interrupt)
+ MCFG_IDE_CONTROLLER_ADD("ide", jdredd_ide_interrupt)
MACHINE_CONFIG_END
/*
@@ -2350,12 +2350,12 @@ static MACHINE_RESET( coh1001l )
static MACHINE_CONFIG_DERIVED( coh1001l, zn1_2mb_vram )
-// MDRV_CPU_ADD("audiocpu", M68000, 10000000 )
-// MDRV_CPU_PROGRAM_MAP( atlus_snd_map)
+// MCFG_CPU_ADD("audiocpu", M68000, 10000000 )
+// MCFG_CPU_PROGRAM_MAP( atlus_snd_map)
- MDRV_MACHINE_RESET( coh1001l )
+ MCFG_MACHINE_RESET( coh1001l )
-// MDRV_SOUND_ADD( "ymz", wYMZ280B, ymz280b_intf )
+// MCFG_SOUND_ADD( "ymz", wYMZ280B, ymz280b_intf )
MACHINE_CONFIG_END
/*
@@ -2394,7 +2394,7 @@ static MACHINE_RESET( coh1002v )
static MACHINE_CONFIG_DERIVED( coh1002v, zn1_2mb_vram )
- MDRV_MACHINE_RESET( coh1002v )
+ MCFG_MACHINE_RESET( coh1002v )
MACHINE_CONFIG_END
/*
@@ -2635,28 +2635,28 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( coh1002m, zn1_2mb_vram )
- MDRV_MACHINE_RESET( coh1002m )
+ MCFG_MACHINE_RESET( coh1002m )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( coh1002msnd, zn1_2mb_vram )
- MDRV_CPU_ADD("audiocpu", Z80, 32000000/8 )
- MDRV_CPU_PROGRAM_MAP( cbaj_z80_map)
- MDRV_CPU_IO_MAP( cbaj_z80_port_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 32000000/8 )
+ MCFG_CPU_PROGRAM_MAP( cbaj_z80_map)
+ MCFG_CPU_IO_MAP( cbaj_z80_port_map)
- MDRV_MACHINE_RESET( coh1002m )
+ MCFG_MACHINE_RESET( coh1002m )
- MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( coh1002ml, zn1_2mb_vram )
- MDRV_CPU_ADD("link", Z80, 8000000 )
- MDRV_CPU_PROGRAM_MAP( link_map)
+ MCFG_CPU_ADD("link", Z80, 8000000 )
+ MCFG_CPU_PROGRAM_MAP( link_map)
- MDRV_MACHINE_RESET( coh1002m )
+ MCFG_MACHINE_RESET( coh1002m )
MACHINE_CONFIG_END
static INPUT_PORTS_START( zn )
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 5031afb1b15..d8a48c3dabf 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -573,42 +573,42 @@ GFXDECODE_END
static MACHINE_CONFIG_START( zodiack, zodiack_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(io_map)
- MDRV_CPU_VBLANK_INT_HACK(zodiac_sound_nmi_gen,8) /* IRQs are triggered by the main CPU */
+ MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(io_map)
+ MCFG_CPU_VBLANK_INT_HACK(zodiac_sound_nmi_gen,8) /* IRQs are triggered by the main CPU */
- MDRV_MACHINE_RESET(zodiack)
- MDRV_MACHINE_START(zodiack)
+ MCFG_MACHINE_RESET(zodiack)
+ MCFG_MACHINE_START(zodiack)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* frames per second, vblank duration */)
- 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)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */ /* frames per second, vblank duration */)
+ 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)
- MDRV_GFXDECODE(zodiack)
- MDRV_PALETTE_LENGTH(4*8+2*8+2*1)
+ MCFG_GFXDECODE(zodiack)
+ MCFG_PALETTE_LENGTH(4*8+2*8+2*1)
- MDRV_PALETTE_INIT(zodiack)
- MDRV_VIDEO_START(zodiack)
- MDRV_VIDEO_UPDATE(zodiack)
+ MCFG_PALETTE_INIT(zodiack)
+ MCFG_VIDEO_START(zodiack)
+ MCFG_VIDEO_UPDATE(zodiack)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1789750)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1789750)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( percuss, zodiack )
- MDRV_MACHINE_START(percuss)
+ MCFG_MACHINE_START(percuss)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 4a3cffe6f3f..a32e96a8469 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -720,54 +720,54 @@ static MACHINE_RESET( zr107 )
static MACHINE_CONFIG_START( zr107, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(zr107_map)
- MDRV_CPU_VBLANK_INT("screen", zr107_vblank)
+ MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_PROGRAM_MAP(zr107_map)
+ MCFG_CPU_VBLANK_INT("screen", zr107_vblank)
- MDRV_CPU_ADD("audiocpu", M68000, 64000000/8) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_CPU_ADD("audiocpu", M68000, 64000000/8) /* 8MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc_map)
+ MCFG_CPU_ADD("dsp", ADSP21062, 36000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(sharc_map)
- MDRV_QUANTUM_TIME(HZ(30000))
+ MCFG_QUANTUM_TIME(HZ(30000))
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_MACHINE_START(zr107)
- MDRV_MACHINE_RESET(zr107)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(zr107)
+ MCFG_MACHINE_RESET(zr107)
- MDRV_K056230_ADD("k056230", zr107_k056230_intf)
+ MCFG_K056230_ADD("k056230", zr107_k056230_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 48*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 48*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_VIDEO_START(zr107)
- MDRV_VIDEO_UPDATE(zr107)
+ MCFG_VIDEO_START(zr107)
+ MCFG_VIDEO_UPDATE(zr107)
- MDRV_K056832_ADD("k056832", zr107_k056832_intf)
+ MCFG_K056832_ADD("k056832", zr107_k056832_intf)
- MDRV_K056800_ADD("k056800", zr107_k056800_interface)
+ MCFG_K056800_ADD("k056800", zr107_k056800_interface)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami1", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("konami1", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("konami2", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("konami2", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_ADC0838_ADD("adc0838", zr107_adc_interface)
+ MCFG_ADC0838_ADD("adc0838", zr107_adc_interface)
MACHINE_CONFIG_END
@@ -781,54 +781,54 @@ static const k001604_interface jetwave_k001604_intf =
static MACHINE_CONFIG_START( jetwave, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
- MDRV_CPU_PROGRAM_MAP(jetwave_map)
- MDRV_CPU_VBLANK_INT("screen", zr107_vblank)
+ MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MCFG_CPU_PROGRAM_MAP(jetwave_map)
+ MCFG_CPU_VBLANK_INT("screen", zr107_vblank)
- MDRV_CPU_ADD("audiocpu", M68000, 64000000/8) /* 8MHz */
- MDRV_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_CPU_ADD("audiocpu", M68000, 64000000/8) /* 8MHz */
+ MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MDRV_CPU_ADD("dsp", ADSP21062, 36000000)
- MDRV_CPU_CONFIG(sharc_cfg)
- MDRV_CPU_DATA_MAP(sharc_map)
+ MCFG_CPU_ADD("dsp", ADSP21062, 36000000)
+ MCFG_CPU_CONFIG(sharc_cfg)
+ MCFG_CPU_DATA_MAP(sharc_map)
- MDRV_QUANTUM_TIME(HZ(30000))
+ MCFG_QUANTUM_TIME(HZ(30000))
- MDRV_EEPROM_93C46_ADD("eeprom")
- MDRV_MACHINE_START(zr107)
- MDRV_MACHINE_RESET(zr107)
+ MCFG_EEPROM_93C46_ADD("eeprom")
+ MCFG_MACHINE_START(zr107)
+ MCFG_MACHINE_RESET(zr107)
- MDRV_K056230_ADD("k056230", zr107_k056230_intf)
+ MCFG_K056230_ADD("k056230", zr107_k056230_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 48*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 48*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1)
- MDRV_PALETTE_LENGTH(65536)
+ MCFG_PALETTE_LENGTH(65536)
- MDRV_VIDEO_START(jetwave)
- MDRV_VIDEO_UPDATE(jetwave)
+ MCFG_VIDEO_START(jetwave)
+ MCFG_VIDEO_UPDATE(jetwave)
- MDRV_K001604_ADD("k001604", jetwave_k001604_intf)
+ MCFG_K001604_ADD("k001604", jetwave_k001604_intf)
- MDRV_K056800_ADD("k056800", zr107_k056800_interface)
+ MCFG_K056800_ADD("k056800", zr107_k056800_interface)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("konami1", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("konami1", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_SOUND_ADD("konami2", K054539, 48000)
- MDRV_SOUND_CONFIG(k054539_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("konami2", K054539, 48000)
+ MCFG_SOUND_CONFIG(k054539_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MDRV_ADC0838_ADD("adc0838", zr107_adc_interface)
+ MCFG_ADC0838_ADD("adc0838", zr107_adc_interface)
MACHINE_CONFIG_END
/*****************************************************************************/
diff --git a/src/mame/includes/naomibd.h b/src/mame/includes/naomibd.h
index e21c9061ba7..a6cf56cd149 100644
--- a/src/mame/includes/naomibd.h
+++ b/src/mame/includes/naomibd.h
@@ -44,38 +44,38 @@ struct _naomibd_config
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_NAOMIBD_ADD(_tag, _type) \
- MDRV_DEVICE_ADD(_tag, NAOMI_BOARD, 0) \
- MDRV_DEVICE_CONFIG_DATA32(naomibd_config, type, _type)
+#define MCFG_NAOMIBD_ADD(_tag, _type) \
+ MCFG_DEVICE_ADD(_tag, NAOMI_BOARD, 0) \
+ MCFG_DEVICE_CONFIG_DATA32(naomibd_config, type, _type)
-#define MDRV_NAOMI_ROM_BOARD_ADD(_tag, _region) \
- MDRV_NAOMIBD_ADD(_tag, ROM_BOARD) \
- MDRV_NAOMIBD_REGION(_region)
+#define MCFG_NAOMI_ROM_BOARD_ADD(_tag, _region) \
+ MCFG_NAOMIBD_ADD(_tag, ROM_BOARD) \
+ MCFG_NAOMIBD_REGION(_region)
-#define MDRV_AW_ROM_BOARD_ADD(_tag, _region) \
- MDRV_NAOMIBD_ADD(_tag, AW_ROM_BOARD) \
- MDRV_NAOMIBD_REGION(_region)
+#define MCFG_AW_ROM_BOARD_ADD(_tag, _region) \
+ MCFG_NAOMIBD_ADD(_tag, AW_ROM_BOARD) \
+ MCFG_NAOMIBD_REGION(_region)
-#define MDRV_NAOMI_DIMM_BOARD_ADD(_tag, _gdrom, _region, _pic) \
- MDRV_NAOMIBD_ADD(_tag, DIMM_BOARD) \
- MDRV_NAOMIBD_REGION(_region) \
- MDRV_NAOMIBD_GDROM_REGION(_gdrom) \
- MDRV_NAOMIBD_PIC_REGION(_pic)
+#define MCFG_NAOMI_DIMM_BOARD_ADD(_tag, _gdrom, _region, _pic) \
+ MCFG_NAOMIBD_ADD(_tag, DIMM_BOARD) \
+ MCFG_NAOMIBD_REGION(_region) \
+ MCFG_NAOMIBD_GDROM_REGION(_gdrom) \
+ MCFG_NAOMIBD_PIC_REGION(_pic)
-#define MDRV_NAOMIBD_REGION(_region) \
- MDRV_DEVICE_CONFIG_DATAPTR(naomibd_config, regiontag, _region)
+#define MCFG_NAOMIBD_REGION(_region) \
+ MCFG_DEVICE_CONFIG_DATAPTR(naomibd_config, regiontag, _region)
-#define MDRV_NAOMIBD_GDROM_REGION(_region) \
- MDRV_DEVICE_CONFIG_DATAPTR(naomibd_config, gdromregiontag, _region)
+#define MCFG_NAOMIBD_GDROM_REGION(_region) \
+ MCFG_DEVICE_CONFIG_DATAPTR(naomibd_config, gdromregiontag, _region)
-#define MDRV_NAOMIBD_PIC_REGION(_region) \
- MDRV_DEVICE_CONFIG_DATAPTR(naomibd_config, picregiontag, _region)
+#define MCFG_NAOMIBD_PIC_REGION(_region) \
+ MCFG_DEVICE_CONFIG_DATAPTR(naomibd_config, picregiontag, _region)
-#define MDRV_NAOMIBD_MODIFY(_tag) \
- MDRV_DEVICE_MODIFY(_tag)
+#define MCFG_NAOMIBD_MODIFY(_tag) \
+ MCFG_DEVICE_MODIFY(_tag)
-/*#define MDRV_NAOMIBD_TMU_MEMORY(_tmu, _tmumem) \
- MDRV_DEVICE_CONFIG_DATA32(naomibd_config, tmumem##_tmu, _tmumem)*/
+/*#define MCFG_NAOMIBD_TMU_MEMORY(_tmu, _tmumem) \
+ MCFG_DEVICE_CONFIG_DATA32(naomibd_config, tmumem##_tmu, _tmumem)*/
/*----------- defined in machine/naomibd.c -----------*/
diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c
index 028531b43e9..461b90f8034 100644
--- a/src/mame/machine/asic65.c
+++ b/src/mame/machine/asic65.c
@@ -536,9 +536,9 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( asic65 )
/* ASIC65 */
- MDRV_CPU_ADD("asic65", TMS32010, 20000000)
- MDRV_CPU_PROGRAM_MAP(asic65_program_map)
- MDRV_CPU_IO_MAP(asic65_io_map)
+ MCFG_CPU_ADD("asic65", TMS32010, 20000000)
+ MCFG_CPU_PROGRAM_MAP(asic65_program_map)
+ MCFG_CPU_IO_MAP(asic65_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/atari_vg.h b/src/mame/machine/atari_vg.h
index 2948aad4300..120630fe013 100644
--- a/src/mame/machine/atari_vg.h
+++ b/src/mame/machine/atari_vg.h
@@ -11,8 +11,8 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_ATARIVGEAROM_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, ATARIVGEAROM, 0)
+#define MCFG_ATARIVGEAROM_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ATARIVGEAROM, 0)
/***************************************************************************
diff --git a/src/mame/machine/cdicdic.h b/src/mame/machine/cdicdic.h
index 5539e632c4b..10aa1d90cde 100644
--- a/src/mame/machine/cdicdic.h
+++ b/src/mame/machine/cdicdic.h
@@ -33,11 +33,11 @@ TODO:
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_CDICDIC_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, MACHINE_CDICDIC, 0) \
+#define MCFG_CDICDIC_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, MACHINE_CDICDIC, 0) \
-#define MDRV_CDICDIC_REPLACE(_tag) \
- MDRV_DEVICE_REPLACE(_tag, MACHINE_CDICDIC, 0) \
+#define MCFG_CDICDIC_REPLACE(_tag) \
+ MCFG_DEVICE_REPLACE(_tag, MACHINE_CDICDIC, 0) \
diff --git a/src/mame/machine/cdislave.h b/src/mame/machine/cdislave.h
index fff9e109f5d..a6350180ff6 100644
--- a/src/mame/machine/cdislave.h
+++ b/src/mame/machine/cdislave.h
@@ -30,11 +30,11 @@ TODO:
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_CDISLAVE_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, MACHINE_CDISLAVE, 0) \
+#define MCFG_CDISLAVE_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, MACHINE_CDISLAVE, 0) \
-#define MDRV_CDISLAVE_REPLACE(_tag) \
- MDRV_DEVICE_REPLACE(_tag, MACHINE_CDISLAVE, 0) \
+#define MCFG_CDISLAVE_REPLACE(_tag) \
+ MCFG_DEVICE_REPLACE(_tag, MACHINE_CDISLAVE, 0) \
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/machine/decocass.h b/src/mame/machine/decocass.h
index 9a48fc6f9f6..1b0ed89fdee 100644
--- a/src/mame/machine/decocass.h
+++ b/src/mame/machine/decocass.h
@@ -10,8 +10,8 @@
DECLARE_LEGACY_DEVICE(DECOCASS_TAPE, decocass_tape);
-#define MDRV_DECOCASS_TAPE_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, DECOCASS_TAPE, 0)
+#define MCFG_DECOCASS_TAPE_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, DECOCASS_TAPE, 0)
diff --git a/src/mame/machine/mathbox.h b/src/mame/machine/mathbox.h
index 131bc207ebc..231bd2deb46 100644
--- a/src/mame/machine/mathbox.h
+++ b/src/mame/machine/mathbox.h
@@ -11,8 +11,8 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_MATHBOX_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, MATHBOX, 0)
+#define MCFG_MATHBOX_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, MATHBOX, 0)
diff --git a/src/mame/machine/namco06.h b/src/mame/machine/namco06.h
index a1def94b349..159a670828c 100644
--- a/src/mame/machine/namco06.h
+++ b/src/mame/machine/namco06.h
@@ -15,13 +15,13 @@ struct _namco_06xx_config
};
-#define MDRV_NAMCO_06XX_ADD(_tag, _clock, _nmicpu, _chip0, _chip1, _chip2, _chip3) \
- MDRV_DEVICE_ADD(_tag, NAMCO_06XX, _clock) \
- MDRV_DEVICE_CONFIG_DATAPTR(namco_06xx_config, nmicpu, _nmicpu) \
- MDRV_DEVICE_CONFIG_DATAPTR(namco_06xx_config, chip0, _chip0) \
- MDRV_DEVICE_CONFIG_DATAPTR(namco_06xx_config, chip1, _chip1) \
- MDRV_DEVICE_CONFIG_DATAPTR(namco_06xx_config, chip2, _chip2) \
- MDRV_DEVICE_CONFIG_DATAPTR(namco_06xx_config, chip3, _chip3)
+#define MCFG_NAMCO_06XX_ADD(_tag, _clock, _nmicpu, _chip0, _chip1, _chip2, _chip3) \
+ MCFG_DEVICE_ADD(_tag, NAMCO_06XX, _clock) \
+ MCFG_DEVICE_CONFIG_DATAPTR(namco_06xx_config, nmicpu, _nmicpu) \
+ MCFG_DEVICE_CONFIG_DATAPTR(namco_06xx_config, chip0, _chip0) \
+ MCFG_DEVICE_CONFIG_DATAPTR(namco_06xx_config, chip1, _chip1) \
+ MCFG_DEVICE_CONFIG_DATAPTR(namco_06xx_config, chip2, _chip2) \
+ MCFG_DEVICE_CONFIG_DATAPTR(namco_06xx_config, chip3, _chip3)
READ8_DEVICE_HANDLER( namco_06xx_data_r );
diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c
index 8c1ddb24174..08b00dad5c7 100644
--- a/src/mame/machine/namco50.c
+++ b/src/mame/machine/namco50.c
@@ -262,8 +262,8 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( namco_50xx )
- MDRV_CPU_ADD("mcu", MB8842, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MDRV_CPU_IO_MAP(namco_50xx_map_io)
+ MCFG_CPU_ADD("mcu", MB8842, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_CPU_IO_MAP(namco_50xx_map_io)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/namco50.h b/src/mame/machine/namco50.h
index 6c367238838..f3d2cf8703a 100644
--- a/src/mame/machine/namco50.h
+++ b/src/mame/machine/namco50.h
@@ -4,8 +4,8 @@
#include "devlegcy.h"
-#define MDRV_NAMCO_50XX_ADD(_tag, _clock) \
- MDRV_DEVICE_ADD(_tag, NAMCO_50XX, _clock) \
+#define MCFG_NAMCO_50XX_ADD(_tag, _clock) \
+ MCFG_DEVICE_ADD(_tag, NAMCO_50XX, _clock) \
READ8_DEVICE_HANDLER( namco_50xx_read );
diff --git a/src/mame/machine/namco51.c b/src/mame/machine/namco51.c
index de5561801a4..0b60f965449 100644
--- a/src/mame/machine/namco51.c
+++ b/src/mame/machine/namco51.c
@@ -358,9 +358,9 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( namco_51xx )
- MDRV_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MDRV_CPU_IO_MAP(namco_51xx_map_io)
- MDRV_DEVICE_DISABLE()
+ MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_CPU_IO_MAP(namco_51xx_map_io)
+ MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
diff --git a/src/mame/machine/namco51.h b/src/mame/machine/namco51.h
index 870f4ced584..93e8d1083e4 100644
--- a/src/mame/machine/namco51.h
+++ b/src/mame/machine/namco51.h
@@ -12,9 +12,9 @@ struct _namco_51xx_interface
};
-#define MDRV_NAMCO_51XX_ADD(_tag, _clock, _interface) \
- MDRV_DEVICE_ADD(_tag, NAMCO_51XX, _clock) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_NAMCO_51XX_ADD(_tag, _clock, _interface) \
+ MCFG_DEVICE_ADD(_tag, NAMCO_51XX, _clock) \
+ MCFG_DEVICE_CONFIG(_interface)
READ8_DEVICE_HANDLER( namco_51xx_read );
diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c
index 69efb656beb..2a52563c9b7 100644
--- a/src/mame/machine/namco53.c
+++ b/src/mame/machine/namco53.c
@@ -153,8 +153,8 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( namco_53xx )
- MDRV_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MDRV_CPU_IO_MAP(namco_53xx_map_io)
+ MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_CPU_IO_MAP(namco_53xx_map_io)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/namco53.h b/src/mame/machine/namco53.h
index 5c01a8b0218..134a9c15292 100644
--- a/src/mame/machine/namco53.h
+++ b/src/mame/machine/namco53.h
@@ -13,9 +13,9 @@ struct _namco_53xx_interface
};
-#define MDRV_NAMCO_53XX_ADD(_tag, _clock, _interface) \
- MDRV_DEVICE_ADD(_tag, NAMCO_53XX, _clock) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_NAMCO_53XX_ADD(_tag, _clock, _interface) \
+ MCFG_DEVICE_ADD(_tag, NAMCO_53XX, _clock) \
+ MCFG_DEVICE_CONFIG(_interface)
void namco_53xx_read_request(running_device *device);
diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h
index 0ef79c75d87..24cac8842c3 100644
--- a/src/mame/machine/namcoio.h
+++ b/src/mame/machine/namcoio.h
@@ -24,17 +24,17 @@ DECLARE_LEGACY_DEVICE(NAMCO56XX, namcoio);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_NAMCO56XX_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, NAMCO56XX, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_NAMCO56XX_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, NAMCO56XX, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_NAMCO58XX_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, NAMCO58XX, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_NAMCO58XX_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, NAMCO58XX, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_NAMCO59XX_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, NAMCO59XX, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_NAMCO59XX_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, NAMCO59XX, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/mame/machine/nmk112.h b/src/mame/machine/nmk112.h
index bd1f76920e1..1a98fdc7a79 100644
--- a/src/mame/machine/nmk112.h
+++ b/src/mame/machine/nmk112.h
@@ -26,9 +26,9 @@ DECLARE_LEGACY_DEVICE(NMK112, nmk112);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_NMK112_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, NMK112, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_NMK112_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, NMK112, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
DEVICE I/O FUNCTIONS
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index 763f725d482..97a9f7d46db 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -329,10 +329,10 @@ ADDRESS_MAP_START( pcat32_io_common, ADDRESS_SPACE_IO, 32 )
ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT(pcat_common)
- MDRV_PIC8259_ADD( "pic8259_1", pic8259_1_config )
- MDRV_PIC8259_ADD( "pic8259_2", pic8259_2_config )
- MDRV_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
- MDRV_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
- MDRV_PIT8254_ADD( "pit8254", at_pit8254_config )
-// MDRV_MC146818_ADD( "rtc", MC146818_STANDARD )
+ MCFG_PIC8259_ADD( "pic8259_1", pic8259_1_config )
+ MCFG_PIC8259_ADD( "pic8259_2", pic8259_2_config )
+ MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config )
+ MCFG_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
+ MCFG_PIT8254_ADD( "pit8254", at_pit8254_config )
+// MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
MACHINE_CONFIG_END
diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h
index 12c03c5049b..f2bdb99a3ef 100644
--- a/src/mame/machine/segaic16.h
+++ b/src/mame/machine/segaic16.h
@@ -62,15 +62,15 @@ DECLARE_LEGACY_DEVICE(_315_5248, ic_315_5248);
DECLARE_LEGACY_DEVICE(_315_5249, ic_315_5249);
DECLARE_LEGACY_DEVICE(_315_5250, ic_315_5250);
-#define MDRV_315_5248_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, _315_5248, 0)
+#define MCFG_315_5248_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, _315_5248, 0)
-#define MDRV_315_5249_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, _315_5249, 0)
+#define MCFG_315_5249_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, _315_5249, 0)
-#define MDRV_315_5250_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, _315_5250, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_315_5250_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, _315_5250, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h
index e008515a461..4516cf4d488 100644
--- a/src/mame/machine/taitoio.h
+++ b/src/mame/machine/taitoio.h
@@ -55,17 +55,17 @@ DECLARE_LEGACY_DEVICE(TC0640FIO, tc0640fio);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_TC0220IOC_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0220IOC, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0220IOC_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0220IOC, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0510NIO_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0510NIO, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0510NIO_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0510NIO, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0640FIO_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0640FIO, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0640FIO_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0640FIO, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/mame/machine/ticket.h b/src/mame/machine/ticket.h
index 5d3518bfb66..a366d836986 100644
--- a/src/mame/machine/ticket.h
+++ b/src/mame/machine/ticket.h
@@ -23,10 +23,10 @@ struct _ticket_config
};
-#define MDRV_TICKET_DISPENSER_ADD(_tag, _clock, _motorhigh, _statushigh) \
- MDRV_DEVICE_ADD(_tag, TICKET_DISPENSER, _clock) \
- MDRV_DEVICE_CONFIG_DATA32(ticket_config, motorhigh, _motorhigh) \
- MDRV_DEVICE_CONFIG_DATA32(ticket_config, statushigh, _statushigh)
+#define MCFG_TICKET_DISPENSER_ADD(_tag, _clock, _motorhigh, _statushigh) \
+ MCFG_DEVICE_ADD(_tag, TICKET_DISPENSER, _clock) \
+ MCFG_DEVICE_CONFIG_DATA32(ticket_config, motorhigh, _motorhigh) \
+ MCFG_DEVICE_CONFIG_DATA32(ticket_config, statushigh, _statushigh)
READ8_DEVICE_HANDLER( ticket_dispenser_r );
diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c
index f5675c4e2d9..3d02171d0c8 100644
--- a/src/mame/video/20pacgal.c
+++ b/src/mame/video/20pacgal.c
@@ -429,12 +429,12 @@ static VIDEO_UPDATE( 20pacgal )
MACHINE_CONFIG_FRAGMENT( 20pacgal_video )
- MDRV_VIDEO_UPDATE(20pacgal)
-
- 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(SCREEN_WIDTH, SCREEN_HEIGHT)
- MDRV_SCREEN_VISIBLE_AREA(0, SCREEN_WIDTH - 1, 0, SCREEN_HEIGHT - 1)
+ MCFG_VIDEO_UPDATE(20pacgal)
+
+ 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(SCREEN_WIDTH, SCREEN_HEIGHT)
+ MCFG_SCREEN_VISIBLE_AREA(0, SCREEN_WIDTH - 1, 0, SCREEN_HEIGHT - 1)
MACHINE_CONFIG_END
diff --git a/src/mame/video/cidelsa.c b/src/mame/video/cidelsa.c
index 1a45141803c..5357169d80a 100644
--- a/src/mame/video/cidelsa.c
+++ b/src/mame/video/cidelsa.c
@@ -205,30 +205,30 @@ static const ay8910_interface ay8910_config =
/* Machine Drivers */
MACHINE_CONFIG_FRAGMENT( destryer_video )
- MDRV_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, DESTRYER_CHR2)
- MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044)
+ MCFG_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, DESTRYER_CHR2)
+ MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_CDP1869_ADD(CDP1869_TAG, DESTRYER_CHR2, destryer_cdp1869_intf, cidelsa_page_ram)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_CDP1869_ADD(CDP1869_TAG, DESTRYER_CHR2, destryer_cdp1869_intf, cidelsa_page_ram)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( altair_video )
- MDRV_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, ALTAIR_CHR2)
- MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044)
+ MCFG_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, ALTAIR_CHR2)
+ MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.4, 0.044)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_CDP1869_ADD(CDP1869_TAG, ALTAIR_CHR2, altair_cdp1869_intf, cidelsa_page_ram)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_CDP1869_ADD(CDP1869_TAG, ALTAIR_CHR2, altair_cdp1869_intf, cidelsa_page_ram)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( draco_video )
- MDRV_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, DRACO_CHR2)
- MDRV_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.360, 0.024)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_CDP1869_ADD(CDP1869_TAG, DRACO_CHR2, draco_cdp1869_intf, draco_page_ram)
- MDRV_SOUND_ADD(AY8910_TAG, AY8910, DRACO_SND_CHR1)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_CDP1869_SCREEN_PAL_ADD(SCREEN_TAG, DRACO_CHR2)
+ MCFG_SCREEN_DEFAULT_POSITION(1.226, 0.012, 1.360, 0.024)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_CDP1869_ADD(CDP1869_TAG, DRACO_CHR2, draco_cdp1869_intf, draco_page_ram)
+ MCFG_SOUND_ADD(AY8910_TAG, AY8910, DRACO_SND_CHR1)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c
index c1b04a1dfcb..4d18be6877d 100644
--- a/src/mame/video/crgolf.c
+++ b/src/mame/video/crgolf.c
@@ -194,13 +194,13 @@ static VIDEO_UPDATE( crgolf )
MACHINE_CONFIG_FRAGMENT( crgolf_video )
- MDRV_VIDEO_START(crgolf)
- MDRV_VIDEO_UPDATE(crgolf)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 247)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_VIDEO_START(crgolf)
+ MCFG_VIDEO_UPDATE(crgolf)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 247)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
MACHINE_CONFIG_END
diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h
index 9510e4d5e22..77aa9641e92 100644
--- a/src/mame/video/deco16ic.h
+++ b/src/mame/video/deco16ic.h
@@ -41,9 +41,9 @@ DECLARE_LEGACY_DEVICE(DECO16IC, deco16ic);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_DECO16IC_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, DECO16IC, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_DECO16IC_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, DECO16IC, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
DEVICE I/O FUNCTIONS
diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c
index e983de5d9dd..5d95e07ac01 100644
--- a/src/mame/video/exidy440.c
+++ b/src/mame/video/exidy440.c
@@ -484,22 +484,22 @@ static VIDEO_UPDATE( topsecex )
*************************************/
MACHINE_CONFIG_FRAGMENT( exidy440_video )
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(exidy440)
- MDRV_VIDEO_UPDATE(exidy440)
- MDRV_PALETTE_LENGTH(256)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(exidy440)
+ MCFG_VIDEO_UPDATE(exidy440)
+ MCFG_PALETTE_LENGTH(256)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( topsecex_video )
- MDRV_VIDEO_ATTRIBUTES(0)
- MDRV_VIDEO_START(topsecex)
- MDRV_VIDEO_UPDATE(topsecex)
+ MCFG_VIDEO_ATTRIBUTES(0)
+ MCFG_VIDEO_START(topsecex)
+ MCFG_VIDEO_UPDATE(topsecex)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, TOPSECEX_VBSTART)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, TOPSECEX_VBSTART)
MACHINE_CONFIG_END
diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c
index b4179948b52..aee709c1079 100644
--- a/src/mame/video/gameplan.c
+++ b/src/mame/video/gameplan.c
@@ -338,25 +338,25 @@ static VIDEO_RESET( gameplan )
*************************************/
MACHINE_CONFIG_FRAGMENT( gameplan_video )
- MDRV_VIDEO_START(gameplan)
- MDRV_VIDEO_RESET(gameplan)
+ MCFG_VIDEO_START(gameplan)
+ MCFG_VIDEO_RESET(gameplan)
- MDRV_VIDEO_START(gameplan)
- MDRV_VIDEO_UPDATE(gameplan)
+ MCFG_VIDEO_START(gameplan)
+ MCFG_VIDEO_UPDATE(gameplan)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(GAMEPLAN_PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(GAMEPLAN_PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( leprechn_video )
- MDRV_VIDEO_START(leprechn)
- MDRV_VIDEO_UPDATE(leprechn)
+ MCFG_VIDEO_START(leprechn)
+ MCFG_VIDEO_UPDATE(leprechn)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( trvquest_video, gameplan_video )
- MDRV_VIDEO_START(trvquest)
- MDRV_VIDEO_UPDATE(gameplan)
+ MCFG_VIDEO_START(trvquest)
+ MCFG_VIDEO_UPDATE(gameplan)
MACHINE_CONFIG_END
diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h
index ffe6e95f557..ea9a574b484 100644
--- a/src/mame/video/gp9001.h
+++ b/src/mame/video/gp9001.h
@@ -96,13 +96,13 @@ const device_type gp9001vdp_ = gp9001vdp_device_config::static_alloc_device_conf
/* vdp map 0, gfx region 0 */
-#define MDRV_DEVICE_ADD_VDP0 \
- MDRV_DEVICE_ADD("gp9001vdp0", gp9001vdp_, 0) \
+#define MCFG_DEVICE_ADD_VDP0 \
+ MCFG_DEVICE_ADD("gp9001vdp0", gp9001vdp_, 0) \
gp9001vdp_device_config::static_set_gfx_region(device, 0); \
/* vdp map 1, gfx region 2 */
-#define MDRV_DEVICE_ADD_VDP1 \
- MDRV_DEVICE_ADD("gp9001vdp1", gp9001vdp_, 0) \
+#define MCFG_DEVICE_ADD_VDP1 \
+ MCFG_DEVICE_ADD("gp9001vdp1", gp9001vdp_, 0) \
gp9001vdp_device_config::static_set_gfx_region(device, 2); \
diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c
index 8029646970e..6c0c31d7ce3 100644
--- a/src/mame/video/jedi.c
+++ b/src/mame/video/jedi.c
@@ -357,12 +357,12 @@ static VIDEO_UPDATE( jedi )
MACHINE_CONFIG_FRAGMENT( jedi_video )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(64*8, 262) /* verify vert size */
- MDRV_SCREEN_VISIBLE_AREA(0*8, 37*8-1, 0*8, 30*8-1)
-
- MDRV_VIDEO_START(jedi)
- MDRV_VIDEO_UPDATE(jedi)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(64*8, 262) /* verify vert size */
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 37*8-1, 0*8, 30*8-1)
+
+ MCFG_VIDEO_START(jedi)
+ MCFG_VIDEO_UPDATE(jedi)
MACHINE_CONFIG_END
diff --git a/src/mame/video/kan_pand.h b/src/mame/video/kan_pand.h
index f41088f2e67..1abc79d2c3a 100644
--- a/src/mame/video/kan_pand.h
+++ b/src/mame/video/kan_pand.h
@@ -30,9 +30,9 @@ DECLARE_LEGACY_DEVICE(KANEKO_PANDORA, kaneko_pandora);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_KANEKO_PANDORA_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, KANEKO_PANDORA, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_KANEKO_PANDORA_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, KANEKO_PANDORA, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/mame/video/konicdev.h b/src/mame/video/konicdev.h
index 7d750166216..46894ab0e7a 100644
--- a/src/mame/video/konicdev.h
+++ b/src/mame/video/konicdev.h
@@ -196,99 +196,99 @@ DECLARE_LEGACY_DEVICE(K037122, k037122);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_K007121_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, K007121, 0)
+#define MCFG_K007121_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, K007121, 0)
-#define MDRV_K007342_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K007342, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K007342_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K007342, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K007420_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K007420, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K007420_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K007420, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K052109_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K052109, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K052109_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K052109, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K051960_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K051960, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K051960_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K051960, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K053244_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K053244, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K053244_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K053244, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K053245_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K053245, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K053245_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K053245, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K053246_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K053246, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K053246_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K053246, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K053247_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K053247, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K053247_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K053247, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K055673_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K055673, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K055673_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K055673, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K051316_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K051316, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K051316_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K051316, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K053936_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K053936, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K053936_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K053936, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K053251_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, K053251, 0)
+#define MCFG_K053251_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, K053251, 0)
-#define MDRV_K054000_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, K054000, 0)
+#define MCFG_K054000_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, K054000, 0)
-#define MDRV_K051733_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, K051733, 0)
+#define MCFG_K051733_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, K051733, 0)
-#define MDRV_K056832_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K056832, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K056832_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K056832, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K055555_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, K055555, 0)
+#define MCFG_K055555_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, K055555, 0)
-#define MDRV_K054338_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K054338, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K054338_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K054338, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K053250_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K053250, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K053250_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K053250, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K053252_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, K053252, 0)
+#define MCFG_K053252_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, K053252, 0)
-#define MDRV_K001006_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K001006, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K001006_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K001006, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K001005_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K001005, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K001005_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K001005, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K001604_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K001604, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K001604_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K001604, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_K037122_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K037122, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K037122_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K037122, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index b9a194962bc..fb79cd00bad 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -537,22 +537,22 @@ static VIDEO_UPDATE( ataxx )
MACHINE_CONFIG_FRAGMENT( leland_video )
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- MDRV_VIDEO_START(leland)
- MDRV_VIDEO_UPDATE(leland)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_START(leland)
+ MCFG_VIDEO_UPDATE(leland)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(40*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(40*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( ataxx_video, leland_video )
- MDRV_VIDEO_START(ataxx)
- MDRV_VIDEO_UPDATE(ataxx)
+ MCFG_VIDEO_START(ataxx)
+ MCFG_VIDEO_UPDATE(ataxx)
MACHINE_CONFIG_END
diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c
index 3e4b8db67aa..cb0eb235dac 100644
--- a/src/mame/video/madalien.c
+++ b/src/mame/video/madalien.c
@@ -401,15 +401,15 @@ static const mc6845_interface mc6845_intf =
MACHINE_CONFIG_FRAGMENT( madalien_video )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 336, 0, 256, 288, 0, 256)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, 336, 0, 256, 288, 0, 256)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_GFXDECODE(madalien)
- MDRV_PALETTE_LENGTH(0x30)
- MDRV_PALETTE_INIT(madalien)
- MDRV_VIDEO_START(madalien)
- MDRV_VIDEO_UPDATE(madalien)
+ MCFG_GFXDECODE(madalien)
+ MCFG_PALETTE_LENGTH(0x30)
+ MCFG_PALETTE_INIT(madalien)
+ MCFG_VIDEO_START(madalien)
+ MCFG_VIDEO_UPDATE(madalien)
- MDRV_MC6845_ADD("crtc", MC6845, PIXEL_CLOCK / 8, mc6845_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, PIXEL_CLOCK / 8, mc6845_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c
index e67427938a9..2917b0f24b3 100644
--- a/src/mame/video/mystston.c
+++ b/src/mame/video/mystston.c
@@ -323,14 +323,14 @@ GFXDECODE_END
MACHINE_CONFIG_FRAGMENT( mystston_video )
- MDRV_VIDEO_START(mystston)
- MDRV_VIDEO_RESET(mystston)
- MDRV_VIDEO_UPDATE(mystston)
+ MCFG_VIDEO_START(mystston)
+ MCFG_VIDEO_RESET(mystston)
+ MCFG_VIDEO_UPDATE(mystston)
- MDRV_GFXDECODE(mystston)
- MDRV_PALETTE_LENGTH(0x40)
+ MCFG_GFXDECODE(mystston)
+ MCFG_PALETTE_LENGTH(0x40)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MACHINE_CONFIG_END
diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h
index 315ffe68c02..33cf925d94f 100644
--- a/src/mame/video/ppu2c0x.h
+++ b/src/mame/video/ppu2c0x.h
@@ -130,36 +130,36 @@ READ8_DEVICE_HANDLER( ppu2c0x_r );
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_PPU2C02_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPU_2C02, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPU2C02_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPU_2C02, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PPU2C03B_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPU_2C03B, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPU2C03B_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPU_2C03B, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PPU2C04_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPU_2C04, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPU2C04_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPU_2C04, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PPU2C05_01_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPU_2C05_01, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPU2C05_01_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPU_2C05_01, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PPU2C05_02_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPU_2C05_02, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPU2C05_02_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPU_2C05_02, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PPU2C05_03_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPU_2C05_03, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPU2C05_03_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPU_2C05_03, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PPU2C05_04_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPU_2C05_04, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPU2C05_04_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPU_2C05_04, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PPU2C07_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPU_2C07, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPU2C07_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPU_2C07, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
#endif /* __PPU_2C0X_H__ */
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index bcef67cf4f7..8aee9145a6f 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -447,29 +447,29 @@ static const m6809_config encryption_config =
MACHINE_CONFIG_FRAGMENT( qix_video )
- MDRV_CPU_ADD("videocpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
- MDRV_CPU_PROGRAM_MAP(qix_video_map)
- MDRV_CPU_CONFIG(encryption_config) // for kram3
+ MCFG_CPU_ADD("videocpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
+ MCFG_CPU_PROGRAM_MAP(qix_video_map)
+ MCFG_CPU_CONFIG(encryption_config) // for kram3
- MDRV_VIDEO_START(qix)
- MDRV_VIDEO_UPDATE(qix)
+ MCFG_VIDEO_START(qix)
+ MCFG_VIDEO_UPDATE(qix)
- MDRV_MC6845_ADD(MC6845_TAG, MC6845, QIX_CHARACTER_CLOCK, mc6845_intf)
+ MCFG_MC6845_ADD(MC6845_TAG, MC6845, QIX_CHARACTER_CLOCK, mc6845_intf)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(QIX_CHARACTER_CLOCK*8, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(QIX_CHARACTER_CLOCK*8, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( zookeep_video )
- MDRV_CPU_MODIFY("videocpu")
- MDRV_CPU_PROGRAM_MAP(zookeep_video_map)
+ MCFG_CPU_MODIFY("videocpu")
+ MCFG_CPU_PROGRAM_MAP(zookeep_video_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( slither_video )
- MDRV_CPU_MODIFY("videocpu")
- MDRV_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
- MDRV_CPU_PROGRAM_MAP(slither_video_map)
+ MCFG_CPU_MODIFY("videocpu")
+ MCFG_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
+ MCFG_CPU_PROGRAM_MAP(slither_video_map)
MACHINE_CONFIG_END
diff --git a/src/mame/video/redalert.c b/src/mame/video/redalert.c
index 56f2b8634b1..267b4c5796a 100644
--- a/src/mame/video/redalert.c
+++ b/src/mame/video/redalert.c
@@ -427,28 +427,28 @@ static VIDEO_UPDATE( panther )
static MACHINE_CONFIG_FRAGMENT( redalert_video_common )
- MDRV_VIDEO_UPDATE(redalert)
+ MCFG_VIDEO_UPDATE(redalert)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- 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, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ 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, 1*8, 31*8-1)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( redalert_video )
- MDRV_VIDEO_START(redalert)
- MDRV_FRAGMENT_ADD( redalert_video_common )
+ MCFG_VIDEO_START(redalert)
+ MCFG_FRAGMENT_ADD( redalert_video_common )
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( ww3_video )
- MDRV_VIDEO_START( ww3 )
- MDRV_FRAGMENT_ADD( redalert_video_common )
+ MCFG_VIDEO_START( ww3 )
+ MCFG_FRAGMENT_ADD( redalert_video_common )
MACHINE_CONFIG_END
@@ -461,30 +461,30 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( demoneye_video )
- MDRV_VIDEO_START(redalert)
- MDRV_VIDEO_UPDATE(demoneye)
+ MCFG_VIDEO_START(redalert)
+ MCFG_VIDEO_UPDATE(demoneye)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- 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, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ 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, 1*8, 31*8-1)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( panther_video )
- MDRV_VIDEO_START(ww3)
- MDRV_VIDEO_UPDATE(panther)
+ MCFG_VIDEO_START(ww3)
+ MCFG_VIDEO_UPDATE(panther)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- 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, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ 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, 1*8, 31*8-1)
MACHINE_CONFIG_END
diff --git a/src/mame/video/segaic16.h b/src/mame/video/segaic16.h
index 2190f4e271e..b86babe9751 100644
--- a/src/mame/video/segaic16.h
+++ b/src/mame/video/segaic16.h
@@ -290,41 +290,41 @@ static const sega16sp_interface xboard_sega16sp_intf =
-#define MDRV_SEGA16SP_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_SEGA16SP_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_SEGA16SP_ADD_HANGON(_tag) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(hangon_sega16sp_intf)
+#define MCFG_SEGA16SP_ADD_HANGON(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(hangon_sega16sp_intf)
-#define MDRV_SEGA16SP_ADD_SHARRIER(_tag) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(sharrier_sega16sp_intf)
+#define MCFG_SEGA16SP_ADD_SHARRIER(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(sharrier_sega16sp_intf)
-#define MDRV_SEGA16SP_ADD_YBOARD(_tag) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(yboard_sega16sp_intf)
+#define MCFG_SEGA16SP_ADD_YBOARD(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(yboard_sega16sp_intf)
-#define MDRV_SEGA16SP_ADD_YBOARD_16B(_tag) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(yboard_16b_sega16sp_intf)
+#define MCFG_SEGA16SP_ADD_YBOARD_16B(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(yboard_16b_sega16sp_intf)
-#define MDRV_SEGA16SP_ADD_16A(_tag) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(s16a_sega16sp_intf)
+#define MCFG_SEGA16SP_ADD_16A(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(s16a_sega16sp_intf)
-#define MDRV_SEGA16SP_ADD_16B(_tag) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(s16b_sega16sp_intf)
+#define MCFG_SEGA16SP_ADD_16B(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(s16b_sega16sp_intf)
-#define MDRV_SEGA16SP_ADD_OUTRUN(_tag) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(outrun_sega16sp_intf)
+#define MCFG_SEGA16SP_ADD_OUTRUN(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(outrun_sega16sp_intf)
-#define MDRV_SEGA16SP_ADD_XBOARD(_tag) \
- MDRV_DEVICE_ADD(_tag, SEGA16SP, 0) \
- MDRV_DEVICE_CONFIG(xboard_sega16sp_intf)
+#define MCFG_SEGA16SP_ADD_XBOARD(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGA16SP, 0) \
+ MCFG_DEVICE_CONFIG(xboard_sega16sp_intf)
extern struct palette_info segaic16_palette;
diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c
index d1da3eee341..051146ff650 100644
--- a/src/mame/video/stactics.c
+++ b/src/mame/video/stactics.c
@@ -411,18 +411,18 @@ static VIDEO_UPDATE( stactics )
MACHINE_CONFIG_FRAGMENT( stactics_video )
- MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
- 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, 0*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, 32*8-1, 0*8, 30*8-1)
- MDRV_PALETTE_LENGTH(0x400)
+ MCFG_PALETTE_LENGTH(0x400)
- MDRV_PALETTE_INIT(stactics)
- MDRV_VIDEO_START(stactics)
- MDRV_VIDEO_UPDATE(stactics)
+ MCFG_PALETTE_INIT(stactics)
+ MCFG_VIDEO_START(stactics)
+ MCFG_VIDEO_UPDATE(stactics)
MACHINE_CONFIG_END
diff --git a/src/mame/video/taitoic.h b/src/mame/video/taitoic.h
index 90b33261d9e..ff7f2386b79 100644
--- a/src/mame/video/taitoic.h
+++ b/src/mame/video/taitoic.h
@@ -122,48 +122,48 @@ DECLARE_LEGACY_DEVICE(TC0180VCU, tc0180vcu);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_PC080SN_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, PC080SN, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_PC080SN_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, PC080SN, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_PC090OJ_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, PC090OJ, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_PC090OJ_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, PC090OJ, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0080VCO_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0080VCO, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0080VCO_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0080VCO, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0100SCN_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0100SCN, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0100SCN_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0100SCN, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0280GRD_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0280GRD, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0280GRD_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0280GRD, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0430GRW_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0430GRW, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0430GRW_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0430GRW, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0360PRI_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, TC0360PRI, 0)
+#define MCFG_TC0360PRI_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, TC0360PRI, 0)
-#define MDRV_TC0150ROD_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0150ROD, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0150ROD_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0150ROD, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0480SCP_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0480SCP, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0480SCP_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0480SCP, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0110PCR_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0110PCR, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0110PCR_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0110PCR, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
-#define MDRV_TC0180VCU_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0180VCU, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0180VCU_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0180VCU, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/mame/video/vrender0.h b/src/mame/video/vrender0.h
index d9d5c278e10..0bf11fa1d85 100644
--- a/src/mame/video/vrender0.h
+++ b/src/mame/video/vrender0.h
@@ -19,9 +19,9 @@ struct _vr0video_interface
DECLARE_LEGACY_DEVICE(VIDEO_VRENDER0, vr0video);
-#define MDRV_VIDEO_VRENDER0_ADD(_tag, _interface) \
-MDRV_DEVICE_ADD(_tag, VIDEO_VRENDER0, 0) \
-MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_VIDEO_VRENDER0_ADD(_tag, _interface) \
+MCFG_DEVICE_ADD(_tag, VIDEO_VRENDER0, 0) \
+MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************